From nobody Sun Oct 27 10:02:37 2024 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 4XbsWx6YQSz5ZcQr; Sun, 27 Oct 2024 10:02:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbsWx5jvxz4hXH; Sun, 27 Oct 2024 10:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730023357; 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=ne9K7NExudGGdJ5oWy1APjW/pQ+NdCp/UAJ2TB8v+kI=; b=M9DCjtKiwTD8+VPyvJWgzUjHWA7magKkPE5uL2M/d+ZOCr6pKrmyUvbdVd8yimZAO3HiHZ fTbp8Q9f51GdDVNamiZl6cRuxAhWDdwgi7Bqy9cpjbZToR4PmV7gGzKlaDLaKhpR34s/z5 DXvBZ/zK0cEMO5Os3mgGOufkidi8/LbEawXSJPAWxWkWusZ0Z0LsuvsTUGI7qujESssdl+ 85atnS1YK9GToHVeolJkvreL+xNaBt9m11WKdg3gjjX3/RWroRCwlwvSBEaJhjU3Sqa1aI w519mQ7IhH7SN8VF09wuMuPSapkNRjT5sCXB7U89YSovlwhDbC+PXDHTIX+V3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730023357; 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=ne9K7NExudGGdJ5oWy1APjW/pQ+NdCp/UAJ2TB8v+kI=; b=v3cH2Y0oABmcSk+tEjZPjBDhvq2ncLXmwhmA6VluQwuba5y1XcAe6y3GzUSfsVcS1X5Ft4 cCLlgcLWVtFOFjLs9iiqoQh8StiHRz9ElQkE5ao3pARJAmDxVPcyL/AbVah+Ufzs4Pl5H7 ZSwHMLK6tVcKd+Vd2DK87wkm1WxUsulMN5TId/4iyDKM3HxIfnCU0EBatF+G4cQV/i85K8 SdNhNEKZDXzLmdOIvbwXm0gnGKaK2CXbOi6nupBuRM19U9G1Xc0bNjoUDb+PohVWkWshqx 5+SIhqo/eSV5WOrZkdF7UihfxU4w3+Ya0ZyD/iEp1hAkpx81WoxpvTXdXF57Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730023357; a=rsa-sha256; cv=none; b=qjSoj3OijSodWQM9TXCv7GlVCa3J168Zn/qdxZy7QiNsIXPFgPm6LNwb8Mm/n3qWxeY0X4 7heq+ebKX3jrlq7NDOTdcgiYHNWBXNi9fDyKYlIOA9JFZ2IWyAj3YhJLv1TqGD6EfqM3z9 ZuizT1puodM22lhdRqNpXwEAeulEoigk00PvV5Bj3f6eUy8BmFzL6RI70aXakAAfrA3l1p oAO/UvzcpiyKFxRdrDxhBWLKR6oseeUwbi1AvGnbD30xcAmd5OCjV0Yor13DhEGqzdz0aJ wCKCVFc7M6E0GvLN7CyC5y4O1vg+ddB1GSyIksVFesxeqHxAsrwvi678zIm6xA== 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 4XbsWx5KdQzqN9; Sun, 27 Oct 2024 10:02:37 +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 49RA2bnK014775; Sun, 27 Oct 2024 10:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RA2bqh014772; Sun, 27 Oct 2024 10:02:37 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:02:37 GMT Message-Id: <202410271002.49RA2bqh014772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 28a93b275570 - main - archivers/snappy-java: enable armv6 and armv7 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: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28a93b27557094699ee751eacf29f6466b9e0c57 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=28a93b27557094699ee751eacf29f6466b9e0c57 commit 28a93b27557094699ee751eacf29f6466b9e0c57 Author: Ronald Klop AuthorDate: 2024-10-24 10:36:53 +0000 Commit: Ronald Klop CommitDate: 2024-10-27 10:01:31 +0000 archivers/snappy-java: enable armv6 and armv7 PR: 282272 Approved by: Angelo Polo (maintainer) --- archivers/snappy-java/Makefile | 6 +++--- archivers/snappy-java/files/patch-Makefile.common | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile index bd46c3334633..e8cc14d88d72 100644 --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -5,6 +5,7 @@ PORTNAME= snappy DISTVERSIONPREFIX= v DISTVERSION= 1.1.10.5 +PORTREVISION= 1 CATEGORIES= archivers java MASTER_SITES= LOCAL/otis:repo PKGNAMESUFFIX= java @@ -21,9 +22,6 @@ WWW= https://github.com/xerial/snappy-java LICENSE= APACHE20 -BROKEN_armv6= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes -BROKEN_armv7= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes - BUILD_DEPENDS= cmake:devel/cmake-core \ sbt:devel/sbt @@ -75,6 +73,8 @@ PLATFORM_DIR_SUFFIX= FreeBSD-x86_64 PLATFORM_DIR_SUFFIX= FreeBSD-x86 . elif ${ARCH} == aarch64 PLATFORM_DIR_SUFFIX= FreeBSD-aarch64 +. elif ${ARCH} == armv6 || ${ARCH} == armv7 +PLATFORM_DIR_SUFFIX= FreeBSD-arm . 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 83e2fc1af300..fde6de71a02b 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 -@@ -29,8 +29,13 @@ IBM_JDK_LIB := lib/inc_ibm +@@ -29,8 +29,13 @@ else ifeq ($(OS_NAME),Mac) ENDIANESS:="Little Endian" else @@ -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-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-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,34 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i +@@ -262,6 +267,41 @@ Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_LINKFLAGS := -dynamiclib Mac-x86_64_LIBNAME := libsnappyjava.dylib Mac-x86_64_SNAPPY_FLAGS := @@ -36,6 +36,13 @@ +FreeBSD-aarch64_LIBNAME := libsnappyjava.so +FreeBSD-aarch64_SNAPPY_FLAGS := + ++FreeBSD-arm_CXX := $(CROSS_PREFIX)g++ ++FreeBSD-arm_STRIP := $(CROSS_PREFIX)strip ++FreeBSD-arm_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden ++FreeBSD-arm_LINKFLAGS := -shared -static-libgcc ++FreeBSD-arm_LIBNAME := libsnappyjava.so ++FreeBSD-arm_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