Attachment #111557 for bug #152842

View | Details | Raw Unified | Return to bug 152842
Collapse All | Expand All




--- configure.orig	2008-04-17 22:29:49.000000000 +0200
+++ configure	2009-11-23 14:17:43.000000000 +0100
@@ -2570,7 +2570,7 @@
     LDFLAGS_ORIG="$LDFLAGS"
     TCL_EXPORT_FILE_SUFFIX=""
     UNSHARED_LIB_SUFFIX=""

     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
@@ -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="-Wl,-soname,\$@"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"




--- configure.orig	2007-12-19 22:50:13.000000000 +0100
+++ configure	2007-12-26 11:49:03.000000000 +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
@@ -7609,7 +7609,7 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""

 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -7620,16 +7620,16 @@
 
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`

 	    	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"




--- configure.orig	2008-04-17 17:14:08.000000000 +0200
+++ configure	2010-12-03 00:16:52.000000000 +0100
@@ -2929,25 +2929,26 @@
 	FreeBSD-*)
 	    # FreeBSD 3.* and greater have ELF.
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD="ld -Bshareable -x"
+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+	    SHLIB_LD="${CC} -shared"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"

 	    	TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
@@ -3427,6 +3428,7 @@
 #define _POSIX_PTHREAD_SEMANTICS 1
 EOF
 




--- configure.orig	2007-12-17 18:57:25.000000000 +0100
+++ configure	2010-09-28 00:00:20.000000000 +0200
@@ -3538,6 +3538,7 @@
 # Threads support - this auto-enables if Tcl was compiled threaded
 #------------------------------------------------------------------------
 

 
     # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
@@ -5815,7 +5816,7 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""

 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -5826,16 +5827,16 @@
 
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`

 	    	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"

Return to bug 152842

Lines 1-6 Link Here

(-)lang/tcl84/files/patch-configure (-5 / +5 lines)
1	--- configure.orig Thu Apr 20 16:42:21 2006	1	--- configure.orig 2008-04-17 22:29:49.000000000 +0200
2	+++ configure Mon May 1 17:31:03 2006	2	+++ configure 2009-11-23 14:17:43.000000000 +0100
3	@@ -2560,7 +2560,7 @@	3	@@ -2570,7 +2570,7 @@
4	LDFLAGS_ORIG="$LDFLAGS"	4	LDFLAGS_ORIG="$LDFLAGS"
5	TCL_EXPORT_FILE_SUFFIX=""	5	TCL_EXPORT_FILE_SUFFIX=""
6	UNSHARED_LIB_SUFFIX=""	6	UNSHARED_LIB_SUFFIX=""
Lines 9-21 Link Here
9	ECHO_VERSION='`echo ${VERSION}`'	9	ECHO_VERSION='`echo ${VERSION}`'
10	TCL_LIB_VERSIONS_OK=ok	10	TCL_LIB_VERSIONS_OK=ok
11	CFLAGS_DEBUG=-g	11	CFLAGS_DEBUG=-g
12	@@ -3384,25 +3384,26 @@	12	@@ -3434,25 +3434,26 @@
13	FreeBSD-*)	13	FreeBSD-*)
14	# FreeBSD 3.* and greater have ELF.	14	# FreeBSD 3.* and greater have ELF.
15	SHLIB_CFLAGS="-fPIC"	15	SHLIB_CFLAGS="-fPIC"
16	- SHLIB_LD="ld -Bshareable -x"	16	- SHLIB_LD="ld -Bshareable -x"
17	+ SHLIB_LD="${CC} -shared"	17	+ SHLIB_LD="${CC} -shared"
18	+ TCL_SHLIB_LD_EXTRAS="-soname \$@"	18	+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
19	SHLIB_LD_LIBS='${LIBS}'	19	SHLIB_LD_LIBS='${LIBS}'
20	SHLIB_SUFFIX=".so"	20	SHLIB_SUFFIX=".so"
21	DL_OBJS="tclLoadDl.o"	21	DL_OBJS="tclLoadDl.o"

Lines 1-15 Link Here

(-)lang/tcl85/files/patch-unix-configure (-4 / +13 lines)
1	--- configure.orig 2007-12-19 22:50:13.000000000 +0100	1	--- configure.orig 2007-12-19 22:50:13.000000000 +0100
2	+++ configure 2007-12-26 11:49:03.000000000 +0100	2	+++ configure 2007-12-26 11:49:03.000000000 +0100
3	@@ -6633,7 +6633,7 @@	3	@@ -6636,7 +6636,7 @@
		4	# is disabled by the user. [Bug 1016796]
4	LDFLAGS_ARCH=""	5	LDFLAGS_ARCH=""
5	TCL_EXPORT_FILE_SUFFIX=""
6	UNSHARED_LIB_SUFFIX=""	6	UNSHARED_LIB_SUFFIX=""
7	- TCL_TRIM_DOTS='`echo ${VERSION} \| tr -d .`'	7	- TCL_TRIM_DOTS='`echo ${VERSION} \| tr -d .`'
8	+ TCL_TRIM_DOTS=`echo ${VERSION} \| tr -d .`	8	+ TCL_TRIM_DOTS=`echo ${VERSION} \| tr -d .`
9	ECHO_VERSION='`echo ${VERSION}`'	9	ECHO_VERSION='`echo ${VERSION}`'
10	TCL_LIB_VERSIONS_OK=ok	10	TCL_LIB_VERSIONS_OK=ok
11	CFLAGS_DEBUG=-g	11	CFLAGS_DEBUG=-g
12	@@ -7624,7 +7624,7 @@	12	@@ -7609,7 +7609,7 @@
13	SHLIB_SUFFIX=".so"	13	SHLIB_SUFFIX=".so"
14	DL_OBJS="tclLoadDl.o"	14	DL_OBJS="tclLoadDl.o"
15	DL_LIBS=""	15	DL_LIBS=""
Lines 18-24 Link Here
18	if test $doRpath = yes; then	18	if test $doRpath = yes; then
19		19
20	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'	20	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
21	@@ -7635,16 +7635,16 @@	21	@@ -7620,16 +7620,16 @@
22		22
23	# The -pthread needs to go in the CFLAGS, not LIBS	23	# The -pthread needs to go in the CFLAGS, not LIBS
24	LIBS=`echo $LIBS \| sed s/-pthread//`	24	LIBS=`echo $LIBS \| sed s/-pthread//`
Lines 39-41 Link Here
39	TCL_LIB_VERSIONS_OK=nodots	39	TCL_LIB_VERSIONS_OK=nodots
40	;;	40	;;
41	esac	41	esac
		42	@@ -7638,7 +7638,7 @@
		43	# This configuration from FreeBSD Ports.
		44	SHLIB_CFLAGS="-fPIC"
		45	SHLIB_LD="${CC} -shared"
		46	- TCL_SHLIB_LD_EXTRAS="-soname \$@"
		47	+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
		48	SHLIB_LD_LIBS='${LIBS}'
		49	SHLIB_SUFFIX=".so"
		50	DL_OBJS="tclLoadDl.o"

Lines 1-11 Link Here

(-)x11-toolkits/tk84/files/patch-aa (-5 / +5 lines)
1	--- configure.orig Wed Apr 19 14:29:37 2006	1	--- configure.orig 2008-04-17 17:14:08.000000000 +0200
2	+++ configure Mon May 1 17:59:53 2006	2	+++ configure 2010-12-03 00:16:52.000000000 +0100
3	@@ -2881,25 +2881,26 @@	3	@@ -2929,25 +2929,26 @@
4	FreeBSD-*)	4	FreeBSD-*)
5	# FreeBSD 3.* and greater have ELF.	5	# FreeBSD 3.* and greater have ELF.
6	SHLIB_CFLAGS="-fPIC"	6	SHLIB_CFLAGS="-fPIC"
7	- SHLIB_LD="ld -Bshareable -x"	7	- SHLIB_LD="ld -Bshareable -x"
8	+ TCL_SHLIB_LD_EXTRAS="-soname \$@"	8	+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
9	+ SHLIB_LD="${CC} -shared"	9	+ SHLIB_LD="${CC} -shared"
10	SHLIB_LD_LIBS='${LIBS}'	10	SHLIB_LD_LIBS='${LIBS}'
11	SHLIB_SUFFIX=".so"	11	SHLIB_SUFFIX=".so"
Lines 34-40 Link Here
34	TCL_LIB_VERSIONS_OK=nodots	34	TCL_LIB_VERSIONS_OK=nodots
35	;;	35	;;
36	esac	36	esac
37	@@ -3472,6 +3473,7 @@	37	@@ -3427,6 +3428,7 @@
38	#define _POSIX_PTHREAD_SEMANTICS 1	38	#define _POSIX_PTHREAD_SEMANTICS 1
39	EOF	39	EOF
40		40

Lines 1-6 Link Here

(-)x11-toolkits/tk85/files/patch-unix::configure (-4 / +13 lines)
1	--- configure.orig 2007-12-17 18:57:25.000000000 +0100	1	--- configure.orig 2007-12-17 18:57:25.000000000 +0100
2	+++ configure 2007-12-29 14:17:55.000000000 +0100	2	+++ configure 2010-09-28 00:00:20.000000000 +0200
3	@@ -3536,6 +3536,7 @@	3	@@ -3538,6 +3538,7 @@
4	# Threads support - this auto-enables if Tcl was compiled threaded	4	# Threads support - this auto-enables if Tcl was compiled threaded
5	#------------------------------------------------------------------------	5	#------------------------------------------------------------------------
6		6
Lines 8-14 Link Here
8		8
9	# Check whether --enable-threads or --disable-threads was given.	9	# Check whether --enable-threads or --disable-threads was given.
10	if test "${enable_threads+set}" = set; then	10	if test "${enable_threads+set}" = set; then
11	@@ -5828,7 +5829,7 @@	11	@@ -5815,7 +5816,7 @@
12	SHLIB_SUFFIX=".so"	12	SHLIB_SUFFIX=".so"
13	DL_OBJS="tclLoadDl.o"	13	DL_OBJS="tclLoadDl.o"
14	DL_LIBS=""	14	DL_LIBS=""
Lines 17-23 Link Here
17	if test $doRpath = yes; then	17	if test $doRpath = yes; then
18		18
19	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'	19	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
20	@@ -5839,16 +5840,16 @@	20	@@ -5826,16 +5827,16 @@
21		21
22	# The -pthread needs to go in the CFLAGS, not LIBS	22	# The -pthread needs to go in the CFLAGS, not LIBS
23	LIBS=`echo $LIBS \| sed s/-pthread//`	23	LIBS=`echo $LIBS \| sed s/-pthread//`
Lines 38-40 Link Here
38	TCL_LIB_VERSIONS_OK=nodots	38	TCL_LIB_VERSIONS_OK=nodots
39	;;	39	;;
40	esac	40	esac
		41	@@ -5844,7 +5845,7 @@
		42	# This configuration from FreeBSD Ports.
		43	SHLIB_CFLAGS="-fPIC"
		44	SHLIB_LD="${CC} -shared"
		45	- TCL_SHLIB_LD_EXTRAS="-soname \$@"
		46	+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
		47	SHLIB_LD_LIBS='${LIBS}'
		48	SHLIB_SUFFIX=".so"
		49	DL_OBJS="tclLoadDl.o"