summaryrefslogtreecommitdiff
path: root/dev-java/snappy-java/files
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2025-08-06 07:02:57 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2025-08-06 07:02:57 +0000
commit20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca (patch)
tree14e0d5c8013827edcbbaaaffe3223548a4eb2864 /dev-java/snappy-java/files
parent509e6c551a619cca02520a6671827dc8a31a9399 (diff)
downloadbaldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.tar.gz
baldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.tar.xz
baldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.zip
Adding metadata
Diffstat (limited to 'dev-java/snappy-java/files')
-rw-r--r--dev-java/snappy-java/files/1.1.7.8-gentoo.patch28
-rw-r--r--dev-java/snappy-java/files/1.1.7.8-java-version-target.patch47
-rw-r--r--dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch26
-rw-r--r--dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch51
4 files changed, 0 insertions, 152 deletions
diff --git a/dev-java/snappy-java/files/1.1.7.8-gentoo.patch b/dev-java/snappy-java/files/1.1.7.8-gentoo.patch
deleted file mode 100644
index b4a58e6482be..000000000000
--- a/dev-java/snappy-java/files/1.1.7.8-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -124,11 +124,7 @@
- $(CXX) $(CXXFLAGS) -c $< -o $@
-
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
-- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
-- # Workaround for strip Protocol error when using VirtualBox on Mac
-- cp $@ /tmp/$(@F)
-- $(STRIP) /tmp/$(@F)
-- cp /tmp/$(@F) $@
-+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle $(LDFLAGS)
-
- clean-native:
- rm -rf $(SNAPPY_OUT)
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -274,8 +274,8 @@
-
- CXX := $($(os_arch)_CXX)
- STRIP := $($(os_arch)_STRIP)
--CXXFLAGS := $($(os_arch)_CXXFLAGS)
--LINKFLAGS := $($(os_arch)_LINKFLAGS)
-+CXXFLAGS := $($(os_arch)_CXXFLAGS) $(CXXFLAGS)
-+LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS)
- LIBNAME := $($(os_arch)_LIBNAME)
- SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
-
diff --git a/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch b/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
deleted file mode 100644
index a852d0bdb807..000000000000
--- a/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e7d1d0167426790ba9b1d28ffa11e0d0c523f3b5 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 6 Feb 2022 08:29:20 -0800
-Subject: [PATCH] Allow Java version target to be specified using variable
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- Makefile | 4 ++--
- Makefile.common | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1d82a8a..8eaa319 100644
---- a/Makefile
-+++ b/Makefile
-@@ -92,13 +92,13 @@ snappy-header: $(SNAPPY_CMAKE_CACHE)
-
- $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java
- @mkdir -p $(TARGET)/jni-classes
-- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
-+ $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
-
- $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
-
- $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java
- @mkdir -p $(TARGET)/jni-classes
-- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
-+ $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
-
- $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
-
-diff --git a/Makefile.common b/Makefile.common
-index 534bc4f..86d839b 100755
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -10,6 +10,8 @@ endif
- JAVA := "$$JAVA_HOME/bin/java"
- JAVAC := "$$JAVA_HOME/bin/javac"
- JAVAH := "$$JAVA_HOME/bin/javah"
-+JAVA_SOURCE := 1.8
-+JAVA_TARGET := 1.8
-
- LITTLE_ENDIAN := "Little Endian"
- BIG_ENDIAN := "Big Endian"
---
-2.34.1
-
diff --git a/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch b/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
deleted file mode 100644
index e4f699ad123e..000000000000
--- a/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -36,11 +36,11 @@
-
- $(SNAPPY_OUT)/%.o: $(BITSHUFFLE_SRC_DIR)/%.c
- @mkdir -p $(@D)
-- $(CXX) $(CXXFLAGS) $(CXXFLAGS_BITSHUFFLE) -c $< -o $@
-+ $(CXX) $(CXXFLAGS) -c $< -o $@
-
--SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) $(patsubst %.c,%.o,$(BITSHUFFLE_C)) SnappyNative.o BitShuffleNative.o)
-+SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o BitShuffleNative.o)
-
--CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT) -I$(BITSHUFFLE_SRC_DIR)
-+CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT)
-
- ifndef CXXFLAGS_BITSHUFFLE
- ifeq ($(OS_NAME)-$(OS_ARCH),Linux-x86_64)
-@@ -124,7 +124,7 @@
- $(CXX) $(CXXFLAGS) -c $< -o $@
-
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
-- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
-+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
- # Workaround for strip Protocol error when using VirtualBox on Mac
- cp $@ /tmp/$(@F)
- $(STRIP) /tmp/$(@F)
diff --git a/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch b/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
deleted file mode 100644
index d516495bb6a7..000000000000
--- a/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ all: snappy
-
- 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-c.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
-@@ -102,7 +102,8 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xeria
-
- $(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)
-@@ -124,7 +125,7 @@ $(SNAPPY_OUT)/BitShuffleNative.o: $(SRC)/org/xerial/snappy/BitShuffleNative.cpp
- $(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)
-@@ -145,9 +146,9 @@ snappy-jar-version:=snappy-java-$(shell ./script/dynver.sh | cut -d'=' -f2 | sed
- jar-version:
- echo $(snappy-jar-version)
-
--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 native-arm clean-docker mac64 win32 win64 linux32 linux64 linux-ppc64le linux-riscv64 linux-s390x
-
-@@ -166,6 +167,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
- 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
-