diff options
Diffstat (limited to 'testing/java-snappy/0001-unbundle-snappy.patch')
| -rw-r--r-- | testing/java-snappy/0001-unbundle-snappy.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/testing/java-snappy/0001-unbundle-snappy.patch b/testing/java-snappy/0001-unbundle-snappy.patch deleted file mode 100644 index b89602386a..0000000000 --- a/testing/java-snappy/0001-unbundle-snappy.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Wed, 6 Apr 2016 00:52:00 +0200 -Subject: [PATCH] Unbundle snappy - -Use system-provided snappy library instead of downloading and building -snappy from the upstream. - -diff --git a/Makefile b/Makefile -index 13838dc..14feedd 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ all: snappy - - SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) -@@ -59,7 +59,7 @@ $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy - $(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative - - ifndef USE_GIT -- $(SNAPPY_SRC): $(SNAPPY_UNPACKED) -+ $(SNAPPY_SRC): - else - $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) - endif -@@ -74,7 +74,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ - - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy - $(STRIP) $@ - - clean-native: -@@ -90,17 +90,18 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") - - ifndef USE_GIT -- native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) -+ native: $(NATIVE_DLL) - else - native: $(SNAPPY_GIT_UNPACKED) $(NATIVE_DLL) - endif --snappy: native $(TARGET)/$(snappy-jar-version).jar -+snappy: native - - $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - @mkdir -p $(@D) - cp $< $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - - package: $(TARGET)/$(snappy-jar-version).jar |