diff options
author | jlam <jlam> | 2004-03-25 22:49:14 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-03-25 22:49:14 +0000 |
commit | ae9472f4e9d53a3475265b0e0cdca25aff269b97 (patch) | |
tree | d70a95ffaab53503f76288ea77adbef4c158558d /x11/tk | |
parent | 4da93a98a329fc8b890452387c30a0aabaf5fc87 (diff) | |
download | pkgsrc-ae9472f4e9d53a3475265b0e0cdca25aff269b97.tar.gz |
Fix tcl/tk configure script stupidity: it overwrote the value of LDFLAGS
that accumulates within itself with a do-nothing version because it tried
to re-use LDFLAGS for another purpose. This broke all library checks after
the "checking for ELF" step. Fix this by (duh) not re-using LDFLAGS but
by using a different variable. Bump the PKGREVISIONs of lang/tcl and
x11/tk.
This fixes building the threaded versions of tcl and tk.
Diffstat (limited to 'x11/tk')
-rw-r--r-- | x11/tk/Makefile | 10 | ||||
-rw-r--r-- | x11/tk/distinfo | 8 | ||||
-rw-r--r-- | x11/tk/patches/patch-aa | 18 | ||||
-rw-r--r-- | x11/tk/patches/patch-ab | 406 | ||||
-rw-r--r-- | x11/tk/patches/patch-ac | 419 |
5 files changed, 824 insertions, 37 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index f2ad53bec8c..dc82b71661f 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2004/03/22 16:14:02 jwise Exp $ +# $NetBSD: Makefile,v 1.32 2004/03/25 22:49:15 jlam Exp $ DISTNAME= tk8.4.6-src PKGNAME= tk-8.4.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -14,7 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib --enable-threads +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+= --enable-threads MAKE_ENV+= TOUCH="${TOUCH}" USE_X11= yes @@ -27,6 +28,8 @@ TEST_TARGET= test # CONFIGURE_ARGS+= --mandir=${WRKDIR}/man +.include "../../lang/tcl/buildlink3.mk" + # Modify mkLinks script to remove the short-filename manpage if it was # linked to a longer filename. # @@ -86,5 +89,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix -.include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 7a2804418a4..78fd043f088 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2004/03/11 01:27:05 minskim Exp $ +$NetBSD: distinfo,v 1.15 2004/03/25 22:49:15 jlam Exp $ SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 Size (tk8.4.6-src.tar.gz) = 3230760 bytes -SHA1 (patch-aa) = 77344c94315f7b1cc24f2f31413e8d75973e0cda -SHA1 (patch-ab) = 7a6340a190a800abb09461dd36fc24846ab2b2d3 -SHA1 (patch-ac) = 9ecaba5cf937832b428fb17e88f874f3fe465bca +SHA1 (patch-aa) = 8d5ef8ca0667c1cec570b8b661d3c3cabf0c44e1 +SHA1 (patch-ab) = a64ea12d46f1e5a7893ac7489c0815f7e1f6fabb +SHA1 (patch-ac) = 055e64d4a3a1e93f6e122ebdad270fb1490fe381 SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa index a472b34025d..04f2f252fb5 100644 --- a/x11/tk/patches/patch-aa +++ b/x11/tk/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2004/03/08 20:29:43 minskim Exp $ +$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $ ---- Makefile.in.orig 2003-11-21 14:17:23.000000000 -0600 +--- Makefile.in.orig Mon Mar 1 19:04:48 2004 +++ Makefile.in @@ -80,7 +80,7 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma # The directory containing the Tcl sources and headers appropriate @@ -11,15 +11,15 @@ $NetBSD: patch-aa,v 1.9 2004/03/08 20:29:43 minskim Exp $ # The directory containing the Tcl library archive file appropriate # for this version of Tk: -@@ -113,7 +113,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -+CFLAGS += @CFLAGS@ @CFLAGS_DEFAULT@ - +@@ -118,7 +118,7 @@ CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ + LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ +-LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@ ++LDFLAGS = @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@ + + # A "-I" switch that can be used when compiling to make all of the + # X11 include files accessible (the configure script will try to @@ -176,8 +176,8 @@ SHELL = /bin/sh INSTALL_STRIP_PROGRAM = -s INSTALL_STRIP_LIBRARY = -S -S diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 5c5a5f7821f..dd3dd946ea7 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ +$NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $ ---- configure.orig 2004-03-01 18:04:48.000000000 -0600 +--- configure.orig Mon Mar 1 19:04:48 2004 +++ configure @@ -2071,6 +2071,7 @@ fi # Step 3: set configuration options based on system name and version. @@ -10,19 +10,136 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -2496,6 +2497,9 @@ fi +@@ -2140,7 +2141,7 @@ fi + SHLIB_SUFFIX=".so" + + DL_OBJS="tclLoadDl.o" +- LDFLAGS="" ++ LD_FLAGS="" + + LD_LIBRARY_PATH_VAR="LIBPATH" + +@@ -2151,7 +2152,7 @@ fi + else + do64bit_ok=yes + EXTRA_CFLAGS="-q64" +- LDFLAGS="-q64" ++ LD_FLAGS="-q64" + RANLIB="${RANLIB} -X64" + AR="${AR} -X64" + SHLIB_LD_FLAGS="-b64" +@@ -2192,7 +2193,7 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + LD_LIBRARY_PATH_VAR="LIBPATH" +@@ -2212,7 +2213,7 @@ fi + else + do64bit_ok=yes + EXTRA_CFLAGS="-q64" +- LDFLAGS="-q64" ++ LD_FLAGS="-q64" + RANLIB="${RANLIB} -X64" + AR="${AR} -X64" + SHLIB_LD_FLAGS="-b64" +@@ -2288,7 +2289,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2299,7 +2300,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-export-dynamic" ++ LD_FLAGS="-export-dynamic" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2310,7 +2311,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2374,7 +2375,7 @@ fi + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadShl.o" + DL_LIBS="-ldld" +- LDFLAGS="-Wl,-E" ++ LD_FLAGS="-Wl,-E" + CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" +@@ -2410,10 +2411,10 @@ fi + do64bit_ok=yes + if test "`uname -m`" = "ia64" ; then + EXTRA_CFLAGS="+DD64" +- LDFLAGS="+DD64 $LDFLAGS" ++ LD_FLAGS="+DD64 $LD_FLAGS" + else + EXTRA_CFLAGS="+DA2.0W" +- LDFLAGS="+DA2.0W $LDFLAGS" ++ LD_FLAGS="+DA2.0W $LD_FLAGS" + fi + fi + fi +@@ -2467,7 +2468,7 @@ fi + SHLIB_LD_LIBS="" + DL_OBJS="tclLoadShl.o" + DL_LIBS="-ldld" +- LDFLAGS="-Wl,-E" ++ LD_FLAGS="-Wl,-E" + CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" +@@ -2480,7 +2481,7 @@ fi + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' +@@ -2495,7 +2496,10 @@ fi + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" - LDFLAGS="" +- LDFLAGS="" ++ LD_FLAGS="" + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -2521,6 +2525,9 @@ fi +@@ -2508,7 +2512,7 @@ fi + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "$GCC" = "yes" ; then + EXTRA_CFLAGS="-mabi=n32" +- LDFLAGS="-mabi=n32" ++ LD_FLAGS="-mabi=n32" + else + case $system in + IRIX-6.3) +@@ -2519,8 +2523,11 @@ fi + EXTRA_CFLAGS="-n32" + ;; esac - LDFLAGS="-n32" +- LDFLAGS="-n32" ++ LD_FLAGS="-n32" fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' @@ -30,8 +147,21 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -2545,6 +2552,9 @@ fi - LDFLAGS="-64" +@@ -2529,7 +2536,7 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + +@@ -2542,9 +2549,12 @@ fi + do64bit_ok=yes + SHLIB_LD="ld -64 -shared -rdata_shared" + EXTRA_CFLAGS="-64" +- LDFLAGS="-64" ++ LD_FLAGS="-64" fi fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' @@ -40,6 +170,24 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" +@@ -2561,7 +2571,7 @@ fi + SHLIB_LD="${CC} -shared" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-rdynamic" ++ LD_FLAGS="-rdynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else +@@ -2597,7 +2607,7 @@ if eval "test \"`echo '$ac_cv_header_'$a + SHLIB_LD="ld -shared" + DL_OBJS="tclLoadDld.o" + DL_LIBS="-ldld" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + else @@ -2626,6 +2636,9 @@ fi EOF @@ -50,7 +198,43 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -2739,7 +2752,6 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -2636,7 +2649,7 @@ EOF + SHLIB_LD="${CC} -shared" + DL_OBJS="" + DL_LIBS="-ldl" +- LDFLAGS="-rdynamic" ++ LD_FLAGS="-rdynamic" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + else +@@ -2672,7 +2685,7 @@ if eval "test \"`echo '$ac_cv_header_'$a + SHLIB_LD="ld -shared" + DL_OBJS="" + DL_LIBS="-ldld" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + else +@@ -2691,7 +2704,7 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2702,7 +2715,7 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-Wl,-Bexport" ++ LD_FLAGS="-Wl,-Bexport" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2739,12 +2752,11 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -58,6 +242,12 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + echo $ac_n "checking for ELF""... $ac_c" 1>&6 @@ -2761,13 +2773,23 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then @@ -84,6 +274,166 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ fi rm -f conftest* +@@ -2781,7 +2803,7 @@ else + SHLIB_SUFFIX=".a" + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' +@@ -2802,14 +2824,14 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LD_FLAGS="-export-dynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` + EXTRA_CFLAGS="-pthread" +- LDFLAGS="$LDFLAGS -pthread" ++ LD_FLAGS="$LD_FLAGS -pthread" + fi + case $system in + FreeBSD-3.*) +@@ -2830,7 +2852,7 @@ fi + DL_OBJS="tclLoadDyld.o" + PLAT_OBJS="tclMacOSXBundle.o" + DL_LIBS="" +- LDFLAGS="-prebind" ++ LD_FLAGS="-prebind" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + CFLAGS_OPTIMIZE="-Os" +@@ -2847,7 +2869,7 @@ fi + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadNext.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2867,7 +2889,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadOSF.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2883,7 +2905,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2899,7 +2921,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "$GCC" = "yes" ; then +@@ -2916,7 +2938,7 @@ EOF + LIBS="$LIBS -lpthread -lmach -lexc" + else + EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" +- LDFLAGS="-pthread" ++ LD_FLAGS="-pthread" + fi + fi + +@@ -2931,7 +2953,7 @@ EOF + DL_OBJS="tclLoadDl.o" + # dlopen is in -lc on QNX + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2942,7 +2964,7 @@ EOF + SHLIB_SUFFIX=".a" + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + ;; +@@ -2952,10 +2974,10 @@ EOF + # below. + if test "$GCC" = "yes" ; then + SHLIB_CFLAGS="-fPIC -melf" +- LDFLAGS="-melf -Wl,-Bexport" ++ LD_FLAGS="-melf -Wl,-Bexport" + else + SHLIB_CFLAGS="-Kpic -belf" +- LDFLAGS="-belf -Wl,-Bexport" ++ LD_FLAGS="-belf -Wl,-Bexport" + fi + SHLIB_LD="ld -G" + SHLIB_LD_LIBS="" +@@ -2972,7 +2994,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -2983,7 +3005,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + +@@ -3019,7 +3041,7 @@ EOF + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + if test "$GCC" = "yes" ; then + SHLIB_LD="$CC -shared" + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' +@@ -3045,7 +3067,7 @@ EOF + + + SHLIB_CFLAGS="-KPIC" +- LDFLAGS="" ++ LD_FLAGS="" + + # Check to enable 64-bit flags for compiler/linker + if test "$do64bit" = "yes" ; then +@@ -3057,10 +3079,10 @@ EOF + do64bit_ok=yes + if test "$do64bitVIS" = "yes" ; then + EXTRA_CFLAGS="-xarch=v9a" +- LDFLAGS="-xarch=v9a" ++ LD_FLAGS="-xarch=v9a" + else + EXTRA_CFLAGS="-xarch=v9" +- LDFLAGS="-xarch=v9" ++ LD_FLAGS="-xarch=v9" + fi + fi + else @@ -3084,6 +3106,9 @@ EOF CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' @@ -94,6 +444,36 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" +@@ -3092,7 +3117,7 @@ EOF + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + if test "$GCC" != "yes" ; then +@@ -3133,9 +3158,9 @@ rm -f conftest* + LDFLAGS=$hold_ldflags + echo "$ac_t""$found" 1>&6 + if test $found = yes; then +- LDFLAGS="-Wl,-Bexport" ++ LD_FLAGS="-Wl,-Bexport" + else +- LDFLAGS="" ++ LD_FLAGS="" + fi + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" +@@ -3310,7 +3335,7 @@ fi + SHLIB_SUFFIX="" + DL_OBJS="tclLoadNone.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + BUILD_DLTEST="" @@ -3355,8 +3380,8 @@ fi if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then @@ -162,3 +542,11 @@ $NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ TK_BUILD_EXP_FILE="" TK_EXP_FILE="" else +@@ -5405,6 +5449,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g + s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g + s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g + s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g ++s%@LD_FLAGS@%$LD_FLAGS%g + s%@STLIB_LD@%$STLIB_LD%g + s%@SHLIB_LD@%$SHLIB_LD%g + s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index f85134b3b5b..6dc5c7da4ba 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ +$NetBSD: patch-ac,v 1.8 2004/03/25 22:49:15 jlam Exp $ ---- tcl.m4.orig 2004-03-01 18:04:48.000000000 -0600 +--- tcl.m4.orig Mon Mar 1 19:04:48 2004 +++ tcl.m4 +@@ -651,7 +651,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [ + # loading for Tcl on this system. + # DL_LIBS - Library file(s) to include in tclsh and other base + # applications in order for the "load" command to work. +-# LDFLAGS - Flags to pass to the compiler when linking object ++# LD_FLAGS - Flags to pass to the compiler when linking object + # files into an executable application binary such + # as tclsh. + # LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib", @@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Step 3: set configuration options based on system name and version. @@ -10,19 +19,136 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1066,6 +1067,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -839,7 +840,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + + DL_OBJS="tclLoadDl.o" +- LDFLAGS="" ++ LD_FLAGS="" + + LD_LIBRARY_PATH_VAR="LIBPATH" + +@@ -850,7 +851,7 @@ dnl AC_CHECK_TOOL(AR, ar) + else + do64bit_ok=yes + EXTRA_CFLAGS="-q64" +- LDFLAGS="-q64" ++ LD_FLAGS="-q64" + RANLIB="${RANLIB} -X64" + AR="${AR} -X64" + SHLIB_LD_FLAGS="-b64" +@@ -891,7 +892,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + LD_LIBRARY_PATH_VAR="LIBPATH" +@@ -911,7 +912,7 @@ dnl AC_CHECK_TOOL(AR, ar) + else + do64bit_ok=yes + EXTRA_CFLAGS="-q64" +- LDFLAGS="-q64" ++ LD_FLAGS="-q64" + RANLIB="${RANLIB} -X64" + AR="${AR} -X64" + SHLIB_LD_FLAGS="-b64" +@@ -944,7 +945,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -955,7 +956,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-export-dynamic" ++ LD_FLAGS="-export-dynamic" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -966,7 +967,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -984,7 +985,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadShl.o" + DL_LIBS="-ldld" +- LDFLAGS="-Wl,-E" ++ LD_FLAGS="-Wl,-E" + CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" +@@ -1020,10 +1021,10 @@ dnl AC_CHECK_TOOL(AR, ar) + do64bit_ok=yes + if test "`uname -m`" = "ia64" ; then + EXTRA_CFLAGS="+DD64" +- LDFLAGS="+DD64 $LDFLAGS" ++ LD_FLAGS="+DD64 $LD_FLAGS" + else + EXTRA_CFLAGS="+DA2.0W" +- LDFLAGS="+DA2.0W $LDFLAGS" ++ LD_FLAGS="+DA2.0W $LD_FLAGS" + fi + fi + fi +@@ -1037,7 +1038,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD_LIBS="" + DL_OBJS="tclLoadShl.o" + DL_LIBS="-ldld" +- LDFLAGS="-Wl,-E" ++ LD_FLAGS="-Wl,-E" + CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" +@@ -1050,7 +1051,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' +@@ -1065,7 +1066,10 @@ dnl AC_CHECK_TOOL(AR, ar) + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" - LDFLAGS="" +- LDFLAGS="" ++ LD_FLAGS="" + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -1091,6 +1095,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1078,7 +1082,7 @@ dnl AC_CHECK_TOOL(AR, ar) + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "$GCC" = "yes" ; then + EXTRA_CFLAGS="-mabi=n32" +- LDFLAGS="-mabi=n32" ++ LD_FLAGS="-mabi=n32" + else + case $system in + IRIX-6.3) +@@ -1089,8 +1093,11 @@ dnl AC_CHECK_TOOL(AR, ar) + EXTRA_CFLAGS="-n32" + ;; esac - LDFLAGS="-n32" +- LDFLAGS="-n32" ++ LD_FLAGS="-n32" fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' @@ -30,8 +156,21 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1115,6 +1122,9 @@ dnl AC_CHECK_TOOL(AR, ar) - LDFLAGS="-64" +@@ -1099,7 +1106,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + +@@ -1112,9 +1119,12 @@ dnl AC_CHECK_TOOL(AR, ar) + do64bit_ok=yes + SHLIB_LD="ld -64 -shared -rdata_shared" + EXTRA_CFLAGS="-64" +- LDFLAGS="-64" ++ LD_FLAGS="-64" fi fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' @@ -40,6 +179,24 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" +@@ -1131,7 +1141,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD="${CC} -shared" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-rdynamic" ++ LD_FLAGS="-rdynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else +@@ -1139,7 +1149,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD="ld -shared" + DL_OBJS="tclLoadDld.o" + DL_LIBS="-ldld" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS=""]) + fi @@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar) # XIM peeking works under XFree86. AC_DEFINE(PEEK_XCLOSEIM) @@ -50,7 +207,43 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1214,7 +1227,6 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1171,7 +1184,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD="${CC} -shared" + DL_OBJS="" + DL_LIBS="-ldl" +- LDFLAGS="-rdynamic" ++ LD_FLAGS="-rdynamic" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + else +@@ -1179,7 +1192,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD="ld -shared" + DL_OBJS="" + DL_LIBS="-ldld" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS=""]) + fi +@@ -1194,7 +1207,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1205,7 +1218,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="-Wl,-Bexport" ++ LD_FLAGS="-Wl,-Bexport" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1214,12 +1227,11 @@ dnl AC_CHECK_TOOL(AR, ar) AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -58,6 +251,12 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + AC_MSG_CHECKING(for ELF) @@ -1227,11 +1239,19 @@ dnl AC_CHECK_TOOL(AR, ar) #ifdef __ELF__ yes @@ -80,6 +279,166 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ ) ], [ SHLIB_CFLAGS="" +@@ -1240,7 +1260,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".a" + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' +@@ -1259,14 +1279,14 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LD_FLAGS="-export-dynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` + EXTRA_CFLAGS="-pthread" +- LDFLAGS="$LDFLAGS -pthread" ++ LD_FLAGS="$LD_FLAGS -pthread" + fi + case $system in + FreeBSD-3.*) +@@ -1287,7 +1307,7 @@ dnl AC_CHECK_TOOL(AR, ar) + DL_OBJS="tclLoadDyld.o" + PLAT_OBJS="tclMacOSXBundle.o" + DL_LIBS="" +- LDFLAGS="-prebind" ++ LD_FLAGS="-prebind" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + CFLAGS_OPTIMIZE="-Os" +@@ -1304,7 +1324,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadNext.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1321,7 +1341,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadOSF.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1337,7 +1357,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1353,7 +1373,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + if test "$GCC" = "yes" ; then +@@ -1370,7 +1390,7 @@ dnl AC_CHECK_TOOL(AR, ar) + LIBS="$LIBS -lpthread -lmach -lexc" + else + EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" +- LDFLAGS="-pthread" ++ LD_FLAGS="-pthread" + fi + fi + +@@ -1385,7 +1405,7 @@ dnl AC_CHECK_TOOL(AR, ar) + DL_OBJS="tclLoadDl.o" + # dlopen is in -lc on QNX + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1396,7 +1416,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".a" + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + ;; +@@ -1406,10 +1426,10 @@ dnl AC_CHECK_TOOL(AR, ar) + # below. + if test "$GCC" = "yes" ; then + SHLIB_CFLAGS="-fPIC -melf" +- LDFLAGS="-melf -Wl,-Bexport" ++ LD_FLAGS="-melf -Wl,-Bexport" + else + SHLIB_CFLAGS="-Kpic -belf" +- LDFLAGS="-belf -Wl,-Bexport" ++ LD_FLAGS="-belf -Wl,-Bexport" + fi + SHLIB_LD="ld -G" + SHLIB_LD_LIBS="" +@@ -1426,7 +1446,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; +@@ -1437,7 +1457,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + +@@ -1467,7 +1487,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +- LDFLAGS="" ++ LD_FLAGS="" + if test "$GCC" = "yes" ; then + SHLIB_LD="$CC -shared" + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' +@@ -1487,7 +1507,7 @@ dnl AC_CHECK_TOOL(AR, ar) + AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) + + SHLIB_CFLAGS="-KPIC" +- LDFLAGS="" ++ LD_FLAGS="" + + # Check to enable 64-bit flags for compiler/linker + if test "$do64bit" = "yes" ; then +@@ -1499,10 +1519,10 @@ dnl AC_CHECK_TOOL(AR, ar) + do64bit_ok=yes + if test "$do64bitVIS" = "yes" ; then + EXTRA_CFLAGS="-xarch=v9a" +- LDFLAGS="-xarch=v9a" ++ LD_FLAGS="-xarch=v9a" + else + EXTRA_CFLAGS="-xarch=v9" +- LDFLAGS="-xarch=v9" ++ LD_FLAGS="-xarch=v9" + fi + fi + else @@ -1526,6 +1546,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' @@ -90,6 +449,36 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" +@@ -1534,7 +1557,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD_LIBS='${LIBS}' + DL_OBJS="tclLoadAout.o" + DL_LIBS="" +- LDFLAGS="-Wl,-D,08000000" ++ LD_FLAGS="-Wl,-D,08000000" + CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + if test "$GCC" != "yes" ; then +@@ -1557,9 +1580,9 @@ dnl AC_CHECK_TOOL(AR, ar) + LDFLAGS=$hold_ldflags + AC_MSG_RESULT($found) + if test $found = yes; then +- LDFLAGS="-Wl,-Bexport" ++ LD_FLAGS="-Wl,-Bexport" + else +- LDFLAGS="" ++ LD_FLAGS="" + fi + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" +@@ -1665,7 +1688,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_SUFFIX="" + DL_OBJS="tclLoadNone.o" + DL_LIBS="" +- LDFLAGS="" ++ LD_FLAGS="" + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + BUILD_DLTEST="" @@ -1710,8 +1733,8 @@ dnl AC_CHECK_TOOL(AR, ar) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then @@ -101,7 +490,15 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -2056,7 +2079,11 @@ AC_DEFUN(SC_PATH_X, [ +@@ -1764,6 +1787,7 @@ dnl esac + AC_SUBST(LDFLAGS_OPTIMIZE) + AC_SUBST(CC_SEARCH_FLAGS) + AC_SUBST(LD_SEARCH_FLAGS) ++ AC_SUBST(LD_FLAGS) + + AC_SUBST(STLIB_LD) + AC_SUBST(SHLIB_LD) +@@ -2056,7 +2080,11 @@ AC_DEFUN(SC_PATH_X, [ for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then AC_MSG_RESULT($i) @@ -114,7 +511,7 @@ $NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ x_libraries="$i" break fi -@@ -2065,7 +2092,11 @@ AC_DEFUN(SC_PATH_X, [ +@@ -2065,7 +2093,11 @@ AC_DEFUN(SC_PATH_X, [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else |