diff options
| author | jlam <jlam> | 2001-10-23 09:55:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-10-23 09:55:47 +0000 |
| commit | edeb03a1e4622da89423f76eae95b7415dff4983 (patch) | |
| tree | a89abaee7da70902d5ed0ccd54c7ab1a1fa71545 /x11/tk/patches | |
| parent | 1291343c9a04c3b66d0bb51a371090849e042907 (diff) | |
| download | pkgsrc-edeb03a1e4622da89423f76eae95b7415dff4983.tar.gz | |
Use -Wl,-R instead of -Wl,-rpath as the former is more consistent with the
rest of pkgsrc.
Diffstat (limited to 'x11/tk/patches')
| -rw-r--r-- | x11/tk/patches/patch-ab | 10 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ac | 6 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ad | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 1928be7d4bc..f50db97fdef 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2001/07/29 07:54:57 tron Exp $ +$NetBSD: patch-ab,v 1.8 2001/10/23 09:55:47 jlam Exp $ --- configure.orig Tue Aug 8 21:19:32 2000 +++ configure Sun Jul 29 09:44:17 2001 @@ -95,8 +95,8 @@ $NetBSD: patch-ab,v 1.7 2001/07/29 07:54:57 tron Exp $ + + echo "$ac_t""yes" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ RPATH_FLAG='-Wl,-rpath,' -+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ RPATH_FLAG='-Wl,-R' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else @@ -685,8 +685,8 @@ $NetBSD: patch-ab,v 1.7 2001/07/29 07:54:57 tron Exp $ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` +elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then + LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'` -+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then -+ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-rpath,/g'` ++elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then ++ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'` fi # The statement below is very tricky! It actually *evaluates* the diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index 003aa2991f0..caa18bb3989 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2001/07/29 07:54:57 tron Exp $ +$NetBSD: patch-ac,v 1.3 2001/10/23 09:55:47 jlam Exp $ --- aclocal.m4.orig Tue Aug 8 21:19:32 2000 +++ aclocal.m4 Sun Jul 29 09:43:02 2001 @@ -27,8 +27,8 @@ $NetBSD: patch-ac,v 1.2 2001/07/29 07:54:57 tron Exp $ AC_MSG_RESULT(yes) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', + SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ RPATH_FLAG='-Wl,-rpath,' -+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ RPATH_FLAG='-Wl,-R' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + ], [ AC_MSG_RESULT(no) diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad index b5f7b2837bb..2ade9917edb 100644 --- a/x11/tk/patches/patch-ad +++ b/x11/tk/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2001/05/24 02:58:30 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2001/10/23 09:55:47 jlam Exp $ --- configure.in.orig Tue Aug 8 15:19:32 2000 +++ configure.in @@ -8,8 +8,8 @@ $NetBSD: patch-ad,v 1.1 2001/05/24 02:58:30 jlam Exp $ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` +elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then + LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'` -+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then -+ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-rpath,/g'` ++elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then ++ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'` fi # The statement below is very tricky! It actually *evaluates* the |