gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/snappy: remove unused patch

Browse Source 
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>
This commit is contained in:
Michael Mair-Keimberger
2023-12-01 16:10:06 +01:00
committed by Miroslav Šulc
parent 766abb7fbc
commit 829bb1d396
1 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
View File

@@ -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