Tony Mancill pushed to branch master at Debian Java Maintainers / snappy-java
Commits: ad8452ec by tony mancill at 2024-04-07T09:45:36-07:00 Add support for loong64 (Closes: #1068233) - - - - - ad63acee by tony mancill at 2024-04-07T09:46:29-07:00 Prepare changelog for upload - - - - - 3 changed files: - debian/changelog - + debian/patches/02-add-support-for-loong64.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +snappy-java (1.1.10.5-2) unstable; urgency=medium + + * Team upload. + * Add support for loong64 (Closes: #1068233) + + -- tony mancill <tmanc...@debian.org> Sun, 07 Apr 2024 09:46:14 -0700 + snappy-java (1.1.10.5-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/02-add-support-for-loong64.patch ===================================== @@ -0,0 +1,69 @@ +Description: add support for loong64 +Bug-Debian: https://bugs.debian.org/1068233 +Origin: upstream +Forwarded: not-needed +Applied-Upstream: https://github.com/xerial/snappy-java/pull/526 +Signed-Off-By: zaixiang +Last-Update: 2024-04-02 + +--- a/Makefile.common ++++ b/Makefile.common +@@ -51,7 +51,7 @@ + # 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-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")) + +@@ -310,6 +310,19 @@ + Windows-aarch64_LINKFLAGS := -Wl,--kill-at -shared -static + Windows-aarch64_LIBNAME := snappyjava.dll + ++Linux-loongarch_CXX := $(CROSS_PREFIX)g++ ++Linux-loongarch_STRIP := $(CROSS_PREFIX)strip ++Linux-loongarch_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -std=c++11 ++Linux-loongarch_LINKFLAGS := -shared ++Linux-loongarch_LIBNAME := libsnappyjava.so ++Linux-loongarch_SNAPPY_FLAGS:= ++ ++Linux-loongarch64_CXX := $(CROSS_PREFIX)g++ ++Linux-loongarch64_STRIP := $(CROSS_PREFIX)strip ++Linux-loongarch64_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -std=c++11 ++Linux-loongarch64_LINKFLAGS := -shared ++Linux-loongarch64_LIBNAME := libsnappyjava.so ++Linux-loongarch64_SNAPPY_FLAGS:= + + CXX := $($(os_arch)_CXX) + STRIP := $($(os_arch)_STRIP) +--- a/build.sbt ++++ b/build.sbt +@@ -110,6 +110,7 @@ + "org/xerial/snappy/native/Linux/armv7/libsnappyjava.so;osname=linux;processor=arm_le", + "org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le", + "org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x", ++ "org/xerial/snappy/native/Linux/loongarch64/libsnappyjava.so;osname=linux;processor=loongarch64", + "org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc", + "org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64", + "org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86", +--- a/src/main/java/org/xerial/snappy/OSInfo.java ++++ b/src/main/java/org/xerial/snappy/OSInfo.java +@@ -48,6 +48,7 @@ + public static final String IBMZ_64 = "s390x"; + public static final String AARCH_64 = "aarch64"; + public static final String RISCV_64 = "riscv64"; ++ public static final String LOONGARCH_64 = "loongarch64"; + + static { + // x86 mappings +@@ -97,6 +98,9 @@ + + // RISC-V mappings + archMapping.put(RISCV_64, RISCV_64); ++ ++ // LoongArch64 mappings ++ archMapping.put(LOONGARCH_64, LOONGARCH_64); + } + + public static void main(String[] args) { ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-load-library.patch +02-add-support-for-loong64.patch View it on GitLab: https://salsa.debian.org/java-team/snappy-java/-/compare/5929f4aec412e92490549e91acb8fb336446e28a...ad63aceecaed2e3db15f4227e9903a0b705bb969 -- View it on GitLab: https://salsa.debian.org/java-team/snappy-java/-/compare/5929f4aec412e92490549e91acb8fb336446e28a...ad63aceecaed2e3db15f4227e9903a0b705bb969 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits