From owner-svn-ports-all@freebsd.org Thu Jun 11 17:29:57 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C94E33AEA3; Thu, 11 Jun 2020 17:29:57 +0000 (UTC) (envelope-from mikael@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jW850rfjz46NR; Thu, 11 Jun 2020 17:29:57 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 134831B96E; Thu, 11 Jun 2020 17:29:57 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHTuOn027320; Thu, 11 Jun 2020 17:29:56 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHTuxV027319; Thu, 11 Jun 2020 17:29:56 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202006111729.05BHTuxV027319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Thu, 11 Jun 2020 17:29:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538513 - in head/archivers/snappy-java: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: in head/archivers/snappy-java: . files X-SVN-Commit-Revision: 538513 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:29:57 -0000 Author: mikael Date: Thu Jun 11 17:29:56 2020 New Revision: 538513 URL: https://svnweb.freebsd.org/changeset/ports/538513 Log: archivers/snappy-java: fix build on aarch64 PR: 247146 Submitted by: Ronald Klop Approved by: Angelo Polo (maintainer) Modified: head/archivers/snappy-java/Makefile head/archivers/snappy-java/files/patch-Makefile.common Modified: head/archivers/snappy-java/Makefile ============================================================================== --- head/archivers/snappy-java/Makefile Thu Jun 11 17:27:18 2020 (r538512) +++ head/archivers/snappy-java/Makefile Thu Jun 11 17:29:56 2020 (r538513) @@ -66,6 +66,8 @@ do-test: PLATFORM_DIR_SUFFIX= FreeBSD-x86_64 . elif ${ARCH} == i386 PLATFORM_DIR_SUFFIX= FreeBSD-x86 +. elif ${ARCH} == aarch64 +PLATFORM_DIR_SUFFIX= FreeBSD-aarch64 . else PLATFORM_DIR_SUFFIX= Default . endif Modified: head/archivers/snappy-java/files/patch-Makefile.common ============================================================================== --- head/archivers/snappy-java/files/patch-Makefile.common Thu Jun 11 17:27:18 2020 (r538512) +++ head/archivers/snappy-java/files/patch-Makefile.common Thu Jun 11 17:29:56 2020 (r538513) @@ -1,18 +1,25 @@ ---- Makefile.common.orig 2020-05-14 10:44:28 UTC +--- Makefile.common.orig 2020-05-06 17:26:51 UTC +++ Makefile.common @@ -45,7 +45,7 @@ endif # os=Default is meant to be generic unix/linux -known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 -+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 ++known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-aarch64 FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 os_arch := $(OS_NAME)-$(OS_ARCH) IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7")) -@@ -249,6 +249,13 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i +@@ -249,6 +249,20 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i Mac-x86_64_LINKFLAGS := -dynamiclib Mac-x86_64_LIBNAME := libsnappyjava.jnilib Mac-x86_64_SNAPPY_FLAGS := ++ ++FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++ ++FreeBSD-aarch64_STRIP := $(CROSS_PREFIX)strip ++FreeBSD-aarch64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden ++FreeBSD-aarch64_LINKFLAGS := -shared -static-libgcc ++FreeBSD-aarch64_LIBNAME := libsnappyjava.so ++FreeBSD-aarch64_SNAPPY_FLAGS := + +FreeBSD-x86_CXX := $(CROSS_PREFIX)g++ +FreeBSD-x86_STRIP := $(CROSS_PREFIX)strip