summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-12-01 16:10:06 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2023-12-02 08:49:12 +0100
commit829bb1d396ef2b3496730c64014df72bbf017728 (patch)
tree1768935e717a50df4b1c9947c5272fdcf12a447b /dev-java/snappy/files
parentnet-misc/iperf: add 3.16 (diff)
downloadgentoo-829bb1d396ef2b3496730c64014df72bbf017728.tar.gz
gentoo-829bb1d396ef2b3496730c64014df72bbf017728.tar.bz2
gentoo-829bb1d396ef2b3496730c64014df72bbf017728.zip
dev-java/snappy: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34077 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/snappy/files')
-rw-r--r--dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
deleted file mode 100644
index 6113019be3ea..000000000000
--- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,8 @@
-
- SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(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-$(SNAPPY_VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
-@@ -100,7 +101,8 @@
-
- $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
-
--$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_GIT_UNPACKED)
-
- # aarch64 can use big-endian optimzied code
- ifeq ($(OS_ARCH),aarch64)
-@@ -122,7 +124,7 @@
- $(CXX) $(CXXFLAGS) -c $< -o $@
-
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
-- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
-+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- # Workaround for strip Protocol error when using VirtualBox on Mac
- cp $@ /tmp/$(@F)
- $(STRIP) /tmp/$(@F)
-@@ -140,9 +142,9 @@
- #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
- snappy-jar-version:=snappy
-
--native: jni-header snappy-header $(NATIVE_DLL)
--native-nocmake: jni-header $(NATIVE_DLL)
--snappy: native $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL)
-+native-nocmake: $(NATIVE_DLL)
-+snappy: native
-
- native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
-
-@@ -151,6 +153,7 @@
- cp $(SNAPPY_OUT)/$(LIBNAME) $@
- @mkdir -p $(NATIVE_TARGET_DIR)
- cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)
-+ cp $< $(TARGET)/
-
- package: $(TARGET)/$(snappy-jar-version).jar
-