From c99ce7c2198429ecc9f9357c40dc7fc4e87b24c1 Mon Sep 17 00:00:00 2001 From: Markus Metz Date: Fri, 25 Mar 2022 19:26:38 +0100 Subject: [PATCH 1/3] Make: add -rpath to LD_SEARCH_FLAGS --- aclocal.m4 | 2 +- configure | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a942b53ac4a..4c7d4947f45 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -488,7 +488,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".so" SHLIB_LD="${CC} -shared" LDFLAGS="-Wl,--export-dynamic" - LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" ;; *-pc-cygwin) diff --git a/configure b/configure index 278bb88bd96..0d3e334a555 100755 --- a/configure +++ b/configure @@ -836,6 +836,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -996,6 +997,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1248,6 +1250,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1385,7 +1396,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1538,6 +1549,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4032,7 +4044,7 @@ ac_save_ldflags="$LDFLAGS" SHLIB_SUFFIX=".so" SHLIB_LD="${CC} -shared" LDFLAGS="-Wl,--export-dynamic" - LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" ;; *-pc-cygwin) From 9752bbfca3ae7c6bae435fa458ff0817d7d58785 Mon Sep 17 00:00:00 2001 From: Markus Metz Date: Sun, 27 Mar 2022 22:42:10 +0200 Subject: [PATCH 2/3] linker: add -rpath for *bsd --- aclocal.m4 | 4 ++-- configure | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4c7d4947f45..25183944294 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -562,7 +562,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".so" LDFLAGS="-Wl,--export-dynamic" #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib' # TODO: add optional pthread support with any combination of: # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" @@ -576,7 +576,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD_LIBS="${LIBS}" LDFLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -export-dynamic' SHLIB_LD_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -export-dynamic' - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath,${INST_DIR}/lib -L${LIB_RUNTIME_DIR}' # some older NetBSD versions do not handle version numbers with dots. #STLIB_SUFFIX='${GRASS_TRIM_DOTS}.a' #SHLIB_SUFFIX='${GRASS_TRIM_DOTS}.so' diff --git a/configure b/configure index 0d3e334a555..cd4bf042752 100755 --- a/configure +++ b/configure @@ -4126,7 +4126,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h SHLIB_SUFFIX=".so" LDFLAGS="-Wl,--export-dynamic" #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib' # TODO: add optional pthread support with any combination of: # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" @@ -4140,7 +4140,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h SHLIB_LD_LIBS="${LIBS}" LDFLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -export-dynamic' SHLIB_LD_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -export-dynamic' - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR} -L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath,${INST_DIR}/lib -L${LIB_RUNTIME_DIR}' # some older NetBSD versions do not handle version numbers with dots. #STLIB_SUFFIX='${GRASS_TRIM_DOTS}.a' #SHLIB_SUFFIX='${GRASS_TRIM_DOTS}.so' From a2b3192ae1db1c9d6d811e33fc679fbf76a6c003 Mon Sep 17 00:00:00 2001 From: Markus Metz Date: Wed, 30 Mar 2022 15:39:07 +0200 Subject: [PATCH 3/3] configure: remove runstatedir additions --- configure | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configure b/configure index cd4bf042752..128ce44d522 100755 --- a/configure +++ b/configure @@ -836,7 +836,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -997,7 +996,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1250,15 +1248,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1396,7 +1385,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1549,7 +1538,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]