diff options
Diffstat (limited to 'archivers/snappy-java/files')
| -rw-r--r-- | archivers/snappy-java/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | archivers/snappy-java/files/patch-Makefile.common | 12 |
2 files changed, 9 insertions, 19 deletions
diff --git a/archivers/snappy-java/files/patch-Makefile b/archivers/snappy-java/files/patch-Makefile index ae6ab7e4591e..3be3eec93eac 100644 --- a/archivers/snappy-java/files/patch-Makefile +++ b/archivers/snappy-java/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2023-09-27 02:22:20 UTC +--- Makefile.orig 2025-07-19 20:40:49 UTC +++ Makefile @@ -4,7 +4,7 @@ MVN:=mvn $(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH)) @@ -17,7 +17,7 @@ SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz -@@ -74,37 +73,28 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) +@@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) $(TAR) xvfz $< -C $(TARGET) touch $@ @@ -41,17 +41,7 @@ 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 8 -target 8 -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 8 -target 8 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< +@@ -104,7 +94,7 @@ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET) $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class diff --git a/archivers/snappy-java/files/patch-Makefile.common b/archivers/snappy-java/files/patch-Makefile.common index f348fa250244..fd7ec71b1d0b 100644 --- a/archivers/snappy-java/files/patch-Makefile.common +++ b/archivers/snappy-java/files/patch-Makefile.common @@ -1,6 +1,6 @@ ---- Makefile.common.orig 2023-09-27 02:22:20 UTC +--- Makefile.common.orig 2025-07-19 20:40:49 UTC +++ Makefile.common -@@ -29,8 +29,13 @@ else +@@ -28,8 +28,13 @@ else ifeq ($(OS_NAME),Mac) ENDIANESS:="Little Endian" else @@ -15,16 +15,16 @@ # Windows uses different path separators ifeq ($(OS_NAME),Windows) -@@ -51,7 +56,7 @@ endif +@@ -50,7 +55,7 @@ endif # os=Default is meant to be generic unix/linux # To support new CPU architecture, add a new target name here --known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 -+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-arm FreeBSD-aarch64 FreeBSD-ppc FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 +-known_os_archs := Linux-x86_64-musl Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64 ++known_os_archs := Linux-x86_64-musl Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-arm FreeBSD-aarch64 FreeBSD-ppc FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64 os_arch := $(OS_NAME)-$(OS_ARCH) IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7")) -@@ -262,6 +267,48 @@ Mac-x86_64_SNAPPY_FLAGS := +@@ -272,6 +277,48 @@ Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_LINKFLAGS := -dynamiclib Mac-x86_64_LIBNAME := libsnappyjava.dylib Mac-x86_64_SNAPPY_FLAGS := |