diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2022-02-07 16:19:20 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2022-02-08 09:10:22 +0100 |
| commit | 2f0ca3b79e73e42ae17220fae0e025337425fdf2 (patch) | |
| tree | 14d90b49f4d082b5f49c03133325fb795e080e71 /dev-java/snappy/files | |
| parent | dev-java/jsch: removed obsolete 0.1.54 (diff) | |
| download | gentoo-2f0ca3b79e73e42ae17220fae0e025337425fdf2.tar.gz gentoo-2f0ca3b79e73e42ae17220fae0e025337425fdf2.tar.bz2 gentoo-2f0ca3b79e73e42ae17220fae0e025337425fdf2.zip | |
dev-java/snappy: Drop 1.1.0.1
Closes: https://bugs.gentoo.org/831269
Closes: https://bugs.gentoo.org/741190
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24114
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/snappy/files')
| -rw-r--r-- | dev-java/snappy/files/1.1.0.1-gentoo.patch | 14 | ||||
| -rw-r--r-- | dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch | 51 |
2 files changed, 0 insertions, 65 deletions
diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch deleted file mode 100644 index 61403dd9167f..000000000000 --- a/dev-java/snappy/files/1.1.0.1-gentoo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index 04f0435..0249d09 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ - - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -- $(STRIP) $@ -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS) - - clean-native: - rm -rf $(SNAPPY_OUT) diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch deleted file mode 100644 index 17fb2e1583ed..000000000000 --- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0821c87..04f0435 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,8 @@ 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-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) -@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou - $(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $< - cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@ - --$(SNAPPY_SRC): $(SNAPPY_UNPACKED) -+$(SNAPPY_SRC): -+# $(SNAPPY_UNPACKED) - - $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc - @mkdir -p $(@D) -@@ -58,7 +60,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: -@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - - snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') - --native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) --snappy: native $(TARGET)/$(snappy-jar-version).jar -+native: $(NATIVE_DLL) -+snappy: native - - $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - @mkdir -p $(@D) - cp $< $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - - $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) |