From nobody Fri Jan 17 21:47:27 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YZYHM5jBJz5kHZF; Fri, 17 Jan 2025 21:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZYHM3Wmvz4GyP; Fri, 17 Jan 2025 21:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gaw7K3vURn70agU79PEtv49/XAGJx0+lsb+ySCMAn+g=; b=E9/LVcFWSmPmc1ei5MNaHK5ck4PJZ3pYW08KVfPIwYXN0z0YMn3tDUqoB7emjMCL2HjICy XhcUh2cTdr61Hy7bvRJodvT+/mkx0CVONIt9pEr3zxYOfxTVHy0dIJYtsMy44w+PLBKg10 cx2fQ8fLboxNu1McCAP5Y9Vq3hJttzeiHTToucoBsMIpO90lqPYEOrl0aFm8Xeg/FP6URU xbJ+LKfA5gZnh49n/L9jFT9eSns0nlDTpEWUO3w2RCtb+a4hTj+uxB8hEghHpOBnuFvEig UETvRKFQla8Ie46hCb0U8NvleSTnuRueRfz/BNTq8JKnPjgJPpYmt+C/R76nAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gaw7K3vURn70agU79PEtv49/XAGJx0+lsb+ySCMAn+g=; b=EOu535xeSe/BTWcvowqSiLeck4qZUcG0o/YEpEeTvd7nrYO0QGjf7TXD81l3Sq8yQHOPrx iuh/VDl3EFyhed1VMNPXqZgSRUHQMSgMHSgA9ZS5YDkI1nR1XQQC0kS+FgGpKO6cv1/JDU FwdEidGYhzJ/Cjb/16m06G/cKTCQLPPlM/lroJHBVQd8X8INOgV2TSqvVe6zjjYN13COCg lpex6WUn7WX1H7GiYqf/+GFDZVJZtnTyVE0lWZG+odykdkoB+ysIgsStFaC5n7MxEipp8q +rasKYkBbxfxgLoG30mBcPq3ltQa7cwp3Yo3kbU/v+nT3ax0T2PWc5eJXdMSyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737150447; a=rsa-sha256; cv=none; b=g/2U8/guxS+MCNjp5XcKyg4ej+8FvF/SqphqCVa7sCQcL0TzmeyY1lmpy5eDpypRlWCHaN gEbUB9Ss4XZmzBI+8iwJ0xZzTg+3XdeN1IXHzQiaYAqbvvSWLTTMd0aosCZe4PacyUe6X5 aVhmp52IMlUoq8cjbfdpJ0JdCTaQEAWQFnPMpDWmdRjWitznrq2yHG2SjGhknkgHS0QyhU CY6Ew4fKKj1t+HkKUul6BYzYBkXmUJNII/OuptJNOJeEUV9u4Coqy9Hzht1kktJ+sWOAHT XkJDA4nSunErWz2+VaNK3N6eFarQZZb7go1i1nWGlGmFbR06oVd8z62+cTRF9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YZYHM36lPzcTb; Fri, 17 Jan 2025 21:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HLlR7J063661; Fri, 17 Jan 2025 21:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HLlRlm063658; Fri, 17 Jan 2025 21:47:27 GMT (envelope-from git) Date: Fri, 17 Jan 2025 21:47:27 GMT Message-Id: <202501172147.50HLlRlm063658@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 93a5b0af88b0 - main - archivers/snappy-java: fix build on powerpc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93a5b0af88b057490b0d6e0c298c749ffa1dc7a9 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=93a5b0af88b057490b0d6e0c298c749ffa1dc7a9 commit 93a5b0af88b057490b0d6e0c298c749ffa1dc7a9 Author: Piotr Kubaj AuthorDate: 2025-01-17 11:44:49 +0000 Commit: Piotr Kubaj 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 +.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