diff options
| author | mm <mm@FreeBSD.org> | 2010-12-09 16:48:49 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-12-09 16:48:49 +0800 |
| commit | 41f09f7efa5c53e0334b7332267508497f90ac20 (patch) | |
| tree | 19e3d4dfe5701de83ecfb8d9aacd6e526d0b1dc3 /x11-toolkits | |
| parent | f2f446d6bc0bbc21e7a2f7a1c13bb9735b44783f (diff) | |
| download | freebsd-ports-gnome-41f09f7efa5c53e0334b7332267508497f90ac20.tar.gz freebsd-ports-gnome-41f09f7efa5c53e0334b7332267508497f90ac20.tar.zst freebsd-ports-gnome-41f09f7efa5c53e0334b7332267508497f90ac20.zip | |
- Unbreak build with clang
PR: ports/152842
Submitted by: Koop Mast <kwm@FreeBSD.org>
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 10 | ||||
| -rw-r--r-- | x11-toolkits/tk85/files/patch-unix::configure | 19 |
2 files changed, 19 insertions, 10 deletions
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" |