diff options
author | jwise <jwise> | 2000-08-29 15:13:43 +0000 |
---|---|---|
committer | jwise <jwise> | 2000-08-29 15:13:43 +0000 |
commit | d0d8cc6b851f452373c9ea57f4bbad57094641f8 (patch) | |
tree | 9cf34d138aa7198084b0e32563aa14c7cad4dc5c /lang | |
parent | 2c3cacd8b97f894fcf55fdf099eea0726069a721 (diff) | |
download | pkgsrc-d0d8cc6b851f452373c9ea57f4bbad57094641f8.tar.gz |
Rework shared library runtime search flags slightly, and improve the
values of such flags that get exported in ${PREFIX}/lib/tclConfig.sh
Diffstat (limited to 'lang')
-rw-r--r-- | lang/tcl/files/patch-sum | 6 | ||||
-rw-r--r-- | lang/tcl/patches/patch-aa | 8 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 38 |
3 files changed, 19 insertions, 33 deletions
diff --git a/lang/tcl/files/patch-sum b/lang/tcl/files/patch-sum index 4ec0dba99bf..d0423c3ae12 100644 --- a/lang/tcl/files/patch-sum +++ b/lang/tcl/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.2 2000/08/24 22:48:15 jwise Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/29 15:13:43 jwise Exp $ -MD5 (patch-aa) = 2ec4e0d0fba9939168ded0af10bad055 -MD5 (patch-ab) = 84805ac4fd2dea2a29e94138aea6863a +MD5 (patch-aa) = b1eb7d53df863592cbf1b0aecd3e7c7c +MD5 (patch-ab) = bba42adcdb6cf2262ea333880fb321b9 MD5 (patch-ac) = 6d7acb944f0ffc6111cd9a250b4ecea2 diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa index 20e8a6d69d5..81f0402cee1 100644 --- a/lang/tcl/patches/patch-aa +++ b/lang/tcl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $ +$NetBSD: patch-aa,v 1.2 2000/08/29 15:13:44 jwise Exp $ --- Makefile.in.orig Tue Aug 8 15:17:11 2000 +++ Makefile.in Thu Aug 24 12:01:11 2000 @@ -161,8 +161,8 @@ @@ -18,8 +18,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $ -STLIB_LD = @STLIB_LD@ -SHLIB_LD = @SHLIB_LD@ -+STLIB_LD = ${LIBTOOL} --mode=link @CC@ -+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ ++STLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ++SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $ #CC = purify -best-effort @CC@ -CC = @CC@ +CC = ${LIBTOOL} --mode=compile @CC@ -+LD = ${LIBTOOL} --mode=link @CC@ ++LD = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib #---------------------------------------------------------------- # The information below should be usable as is. The configure diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index e8047aef13d..83733a6ed23 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,38 +1,24 @@ --- configure.orig Tue Aug 8 15:17:11 2000 -+++ configure Thu Aug 24 17:27:16 2000 -@@ -5070,8 +5071,8 @@ - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="" -- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ LDFLAGS="-version-info 1:0" -+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - echo $ac_n "checking for ELF""... $ac_c" 1>&6 - echo "configure:5077: checking for ELF" >&5 - cat > conftest.$ac_ext <<EOF -@@ -5789,7 +5790,7 @@ ++++ configure Tue Aug 29 10:10:05 2000 +@@ -5789,7 +5789,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}" else - MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" -+ MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:.so=.la} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -rpath ${PREFIX}/lib -version-info 1:0" ++ MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:.so=.la} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0" RANLIB=":" fi else -@@ -5859,9 +5860,9 @@ - #-------------------------------------------------------------------- - - if test "$prefix" != "$exec_prefix"; then -- TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib" -+ TCL_PACKAGE_PATH="${exec_prefix}/lib/tcl ${prefix}/lib/tcl" +@@ -5829,7 +5829,7 @@ + TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" + fi + TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" +- TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" ++ TCL_LIB_SPEC="-L${exec_prefix}/lib -Wl,-R${exec_prefix}/lib ${TCL_LIB_FLAG}" else -- TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH="${prefix}/lib/tcl" - fi - - #-------------------------------------------------------------------- -@@ -6097,6 +6098,8 @@ + TCL_BUILD_EXP_FILE="lib.exp" + eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" +@@ -6097,6 +6097,8 @@ s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g |