diff options
author | jlam <jlam@pkgsrc.org> | 2001-10-23 09:55:47 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-10-23 09:55:47 +0000 |
commit | 2c350496d6337fb0fde3e7db5a86d7e98f626b53 (patch) | |
tree | a89abaee7da70902d5ed0ccd54c7ab1a1fa71545 /x11 | |
parent | 52b3de7e6b55f8e497c80caf9f8e72cf7d428196 (diff) | |
download | pkgsrc-2c350496d6337fb0fde3e7db5a86d7e98f626b53.tar.gz |
Use -Wl,-R instead of -Wl,-rpath as the former is more consistent with the
rest of pkgsrc.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/tk/distinfo | 8 | ||||
-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 |
4 files changed, 15 insertions, 15 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 867f712d3be..70250e5dca6 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2001/07/29 07:54:56 tron Exp $ +$NetBSD: distinfo,v 1.7 2001/10/23 09:55:47 jlam Exp $ SHA1 (tk8.3.2.tar.gz) = a573d33fa76ca64a7148d3cc6b7b18906c311dab Size (tk8.3.2.tar.gz) = 2529172 bytes SHA1 (patch-aa) = 5f87e399acde1b912f0db1abda475fd1564eba06 -SHA1 (patch-ab) = 78ae4e3fd02fa5aa51b26f83483c3c479615bbc0 -SHA1 (patch-ac) = fa91c69bb4bec2ec07be8d819af4b963be19c2b4 -SHA1 (patch-ad) = ec0c859b9561e94c9cbf7d9b78920fe2f0004329 +SHA1 (patch-ab) = 784f119f085e999be5df36a459eaf7b2fbf70ae4 +SHA1 (patch-ac) = edae3c9f968059eb8feb5109b27cf3d3344f70d3 +SHA1 (patch-ad) = 04430772341822d5aa2a6e10b8f5e5055088e02c 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 |