diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2010-12-09 08:48:49 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2010-12-09 08:48:49 +0000 |
| commit | 5b6716a1e7cb1de9b08900243405d76bd1496409 (patch) | |
| tree | 7467ba64cdc117557d7e3578b0ad4a7dff724423 /lang | |
| parent | 86118d106c44021aea85187626377640fa391869 (diff) | |
| download | ports-5b6716a1e7cb1de9b08900243405d76bd1496409.tar.gz ports-5b6716a1e7cb1de9b08900243405d76bd1496409.zip | |
Notes
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl84/files/patch-configure | 10 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-unix-configure | 21 |
2 files changed, 20 insertions, 11 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" |