diff options
| -rw-r--r-- | lang/tcl84/files/patch-configure | 10 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-unix-configure | 21 | ||||
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 10 | ||||
| -rw-r--r-- | x11-toolkits/tk85/files/patch-unix::configure | 19 |
4 files changed, 39 insertions, 21 deletions
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure index 1ccf4b3a685f..d657465cefef 100644 --- a/lang/tcl84/files/patch-configure +++ b/lang/tcl84/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Apr 20 16:42:21 2006 -+++ configure Mon May 1 17:31:03 2006 -@@ -2560,7 +2560,7 @@ +--- configure.orig 2008-04-17 22:29:49.000000000 +0200 ++++ configure 2010-12-09 09:23:49.635333169 +0100 +@@ -2570,7 +2570,7 @@ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@ -9,13 +9,13 @@ ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -3384,25 +3384,26 @@ +@@ -3434,25 +3434,26 @@ FreeBSD-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="${CC} -shared" -+ TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure index 2f596f9521a7..30448eb4d197 100644 --- a/lang/tcl85/files/patch-unix-configure +++ b/lang/tcl85/files/patch-unix-configure @@ -1,15 +1,15 @@ ---- configure.orig 2007-12-19 22:50:13.000000000 +0100 -+++ configure 2007-12-26 11:49:03.000000000 +0100 -@@ -6633,7 +6633,7 @@ +--- configure.orig 2010-09-08 19:40:48.000000000 +0200 ++++ configure 2010-12-09 09:21:58.223421249 +0100 +@@ -6636,7 +6636,7 @@ + # is disabled by the user. [Bug 1016796] LDFLAGS_ARCH="" - TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" - TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -7624,7 +7624,7 @@ +@@ -7609,7 +7609,7 @@ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -18,7 +18,7 @@ if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -7635,16 +7635,16 @@ +@@ -7620,16 +7620,16 @@ # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` @@ -39,3 +39,12 @@ TCL_LIB_VERSIONS_OK=nodots ;; esac +@@ -7638,7 +7638,7 @@ + # This configuration from FreeBSD Ports. + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" +- TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index d2d0814f159d..c406bba18868 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,11 +1,11 @@ ---- configure.orig Wed Apr 19 14:29:37 2006 -+++ configure Mon May 1 17:59:53 2006 -@@ -2881,25 +2881,26 @@ +--- configure.orig 2008-04-17 17:14:08.000000000 +0200 ++++ configure 2010-12-09 09:27:23.108864895 +0100 +@@ -2929,25 +2929,26 @@ FreeBSD-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -+ TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" + SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" @@ -34,7 +34,7 @@ TCL_LIB_VERSIONS_OK=nodots ;; esac -@@ -3472,6 +3473,7 @@ +@@ -3427,6 +3428,7 @@ #define _POSIX_PTHREAD_SEMANTICS 1 EOF diff --git a/x11-toolkits/tk85/files/patch-unix::configure b/x11-toolkits/tk85/files/patch-unix::configure index fe54d378c066..4da022e29b0c 100644 --- a/x11-toolkits/tk85/files/patch-unix::configure +++ b/x11-toolkits/tk85/files/patch-unix::configure @@ -1,6 +1,6 @@ ---- configure.orig 2007-12-17 18:57:25.000000000 +0100 -+++ configure 2007-12-29 14:17:55.000000000 +0100 -@@ -3536,6 +3536,7 @@ +--- configure.orig 2010-09-02 20:12:14.000000000 +0200 ++++ configure 2010-12-09 09:26:30.809229814 +0100 +@@ -3538,6 +3538,7 @@ # Threads support - this auto-enables if Tcl was compiled threaded #------------------------------------------------------------------------ @@ -8,7 +8,7 @@ # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then -@@ -5828,7 +5829,7 @@ +@@ -5815,7 +5816,7 @@ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -17,7 +17,7 @@ if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -5839,16 +5840,16 @@ +@@ -5826,16 +5827,16 @@ # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` @@ -38,3 +38,12 @@ TCL_LIB_VERSIONS_OK=nodots ;; esac +@@ -5844,7 +5845,7 @@ + # This configuration from FreeBSD Ports. + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" +- TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" |