From nobody Sun Oct 10 13:38:04 2021 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 6ABBE12DB5AE; Sun, 10 Oct 2021 13:38:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HS30D2XZ5z4k8k; Sun, 10 Oct 2021 13:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 28FEA6935; Sun, 10 Oct 2021 13:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19ADc4RM035706; Sun, 10 Oct 2021 13:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19ADc4q2035705; Sun, 10 Oct 2021 13:38:04 GMT (envelope-from git) Date: Sun, 10 Oct 2021 13:38:04 GMT Message-Id: <202110101338.19ADc4q2035705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 33f3b768b854 - main - databases/grass7: Fix build on aarch64. 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33f3b768b854fe87864d88fbe9a2094951c030fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=33f3b768b854fe87864d88fbe9a2094951c030fa commit 33f3b768b854fe87864d88fbe9a2094951c030fa Author: Mikael Urankar AuthorDate: 2021-10-10 13:36:37 +0000 Commit: Mikael Urankar CommitDate: 2021-10-10 13:36:37 +0000 databases/grass7: Fix build on aarch64. Use the correct linker flag, ie: -Wl,--export-dynamic Approved by: portmgr (build fix blanket) --- databases/grass7/files/patch-aclocal.m4 | 11 ++++++++--- databases/grass7/files/patch-configure | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/databases/grass7/files/patch-aclocal.m4 b/databases/grass7/files/patch-aclocal.m4 index c3fc06183ca0..393928138bdd 100644 --- a/databases/grass7/files/patch-aclocal.m4 +++ b/databases/grass7/files/patch-aclocal.m4 @@ -1,10 +1,15 @@ ---- aclocal.m4.orig 2020-01-25 14:44:25 UTC +--- aclocal.m4.orig 2020-12-21 18:40:15 UTC +++ aclocal.m4 -@@ -560,6 +560,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -560,10 +560,11 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" #SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])" SHLIB_LD="${CC} -shared" + SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])" SHLIB_SUFFIX=".so" - LDFLAGS="-export-dynamic" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="-Wl,--export-dynamic" + #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + # TODO: add optional pthread support with any combination of: diff --git a/databases/grass7/files/patch-configure b/databases/grass7/files/patch-configure index fe7efd87db60..e40bff3e01a3 100644 --- a/databases/grass7/files/patch-configure +++ b/databases/grass7/files/patch-configure @@ -1,10 +1,15 @@ ---- configure.orig 2020-01-25 14:44:16 UTC +--- configure.orig 2020-12-21 18:40:15 UTC +++ configure -@@ -1591,6 +1591,7 @@ EOF +@@ -1603,10 +1603,11 @@ EOF # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" #SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)" SHLIB_LD="${CC} -shared" + SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)" SHLIB_SUFFIX=".so" - LDFLAGS="-export-dynamic" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="-Wl,--export-dynamic" + #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + # TODO: add optional pthread support with any combination of: