Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Oct 2021 13:38:04 GMT
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 33f3b768b854 - main - databases/grass7: Fix build on aarch64.
Message-ID:  <202110101338.19ADc4q2035705@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=33f3b768b854fe87864d88fbe9a2094951c030fa

commit 33f3b768b854fe87864d88fbe9a2094951c030fa
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2021-10-10 13:36:37 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
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: 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110101338.19ADc4q2035705>