git: 93a5b0af88b0 - main - archivers/snappy-java: fix build on powerpc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jan 2025 21:47:27 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=93a5b0af88b057490b0d6e0c298c749ffa1dc7a9
commit 93a5b0af88b057490b0d6e0c298c749ffa1dc7a9
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2025-01-17 11:44:49 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2025-01-17 21:45:54 +0000
archivers/snappy-java: fix build on powerpc
Add necessary plumbing and avoid resource exhaustion.
---
archivers/snappy-java/Makefile | 6 ++++++
archivers/snappy-java/files/patch-Makefile.common | 11 +++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile
index a0de8443e720..1d8f2705f900 100644
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@@ -46,6 +46,10 @@ PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar \
.include <bsd.port.pre.mk>
+.if ${ARCH} == powerpc
+MAKE_ENV+= _JAVA_OPTIONS="-Xmx768m -Xms768m"
+.endif
+
post-extract:
${MKDIR} ${WRKSRC}/target
${RM} ${WRKSRC}/sbt
@@ -73,6 +77,8 @@ PLATFORM_DIR_SUFFIX= FreeBSD-x86
PLATFORM_DIR_SUFFIX= FreeBSD-aarch64
. elif ${ARCH} == armv6 || ${ARCH} == armv7
PLATFORM_DIR_SUFFIX= FreeBSD-arm
+. elif ${ARCH} == powerpc
+PLATFORM_DIR_SUFFIX= FreeBSD-ppc
. elif ${ARCH} == powerpc64
PLATFORM_DIR_SUFFIX= FreeBSD-ppc64
. elif ${ARCH} == powerpc64le
diff --git a/archivers/snappy-java/files/patch-Makefile.common b/archivers/snappy-java/files/patch-Makefile.common
index db8c35af028e..f348fa250244 100644
--- a/archivers/snappy-java/files/patch-Makefile.common
+++ b/archivers/snappy-java/files/patch-Makefile.common
@@ -20,11 +20,11 @@
# 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-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 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
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,41 @@ Mac-x86_64_SNAPPY_FLAGS :=
+@@ -262,6 +267,48 @@ Mac-x86_64_SNAPPY_FLAGS :=
Mac-x86_64_LINKFLAGS := -dynamiclib
Mac-x86_64_LIBNAME := libsnappyjava.dylib
Mac-x86_64_SNAPPY_FLAGS :=
@@ -43,6 +43,13 @@
+FreeBSD-arm_LIBNAME := libsnappyjava.so
+FreeBSD-arm_SNAPPY_FLAGS :=
+
++FreeBSD-ppc_CXX := $(CROSS_PREFIX)g++
++FreeBSD-ppc_STRIP := $(CROSS_PREFIX)strip
++FreeBSD-ppc_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
++FreeBSD-ppc_LINKFLAGS := -shared -static-libgcc
++FreeBSD-ppc_LIBNAME := libsnappyjava.so
++FreeBSD-ppc_SNAPPY_FLAGS :=
++
+FreeBSD-ppc64_CXX := $(CROSS_PREFIX)g++
+FreeBSD-ppc64_STRIP := $(CROSS_PREFIX)strip
+FreeBSD-ppc64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden