aboutsummaryrefslogtreecommitdiffstats
path: root/lang/tcl85/files/patch-unix-configure
blob: 30448eb4d197b0f3e7f5bce68b53cc1e7a9b7ef8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
--- 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=""
     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=""
-       LDFLAGS="$LDFLAGS -export-dynamic"
+       LDFLAGS=""
        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//`
-       CFLAGS="$CFLAGS -pthread"
-           LDFLAGS="$LDFLAGS -pthread"
+       CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+           LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 
 fi
 
        case $system in
-       FreeBSD-3.*)
+       FreeBSD-*)
            # FreeBSD-3 doesn't handle version numbers with dots.
            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
            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"