pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix tcl/tk configure script stupidity: it overwrote th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/57ff2ee7759b
branches: trunk
changeset: 471307:57ff2ee7759b
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Mar 25 22:49:14 2004 +0000
description:
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:
lang/tcl/Makefile | 10 +-
lang/tcl/distinfo | 9 +-
lang/tcl/patches/patch-aa | 18 +-
lang/tcl/patches/patch-ab | 400 ++++++++++++++++++++++++++++++++++++++++++-
lang/tcl/patches/patch-af | 409 +++++++++++++++++++++++++++++++++++++++++++-
lang/tcl/patches/patch-ag | 13 +
x11/tk/Makefile | 10 +-
x11/tk/distinfo | 8 +-
x11/tk/patches/patch-aa | 18 +-
x11/tk/patches/patch-ab | 406 +++++++++++++++++++++++++++++++++++++++++++-
x11/tk/patches/patch-ac | 419 ++++++++++++++++++++++++++++++++++++++++++++-
11 files changed, 1646 insertions(+), 74 deletions(-)
diffs (truncated from 2120 to 300 lines):
diff -r 6670a8527404 -r 57ff2ee7759b lang/tcl/Makefile
--- a/lang/tcl/Makefile Thu Mar 25 22:45:27 2004 +0000
+++ b/lang/tcl/Makefile Thu Mar 25 22:49:14 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/25 22:49:14 jlam Exp $
#
DISTNAME= tcl8.4.6-src
PKGNAME= tcl-8.4.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -30,7 +30,8 @@
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
# install to avoid overwriting existing manpages in ${PREFIX}/man.
#
-CONFIGURE_ARGS+= --mandir=${WRKDIR}/man --enable-threads
+CONFIGURE_ARGS+= --mandir=${WRKDIR}/man
+CONFIGURE_ARGS+= --enable-threads
# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
@@ -52,6 +53,8 @@
CONFIGURE_ENV+= COMPILER_OPTIMIZATION_BUG=YES
.endif
+.include "../../mk/pthread.buildlink3.mk"
+
# Modify mkLinks script to remove the short-filename manpage if it was
# linked to a longer filename.
#
@@ -96,5 +99,4 @@
${INSTALL_DATA} ${WRKSRC}/../generic/tclPort.h ${PREFIX}/include/tcl/generic
${INSTALL_DATA} ${WRKSRC}/../generic/tclRegexp.h ${PREFIX}/include/tcl/generic
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6670a8527404 -r 57ff2ee7759b lang/tcl/distinfo
--- a/lang/tcl/distinfo Thu Mar 25 22:45:27 2004 +0000
+++ b/lang/tcl/distinfo Thu Mar 25 22:49:14 2004 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.20 2004/03/08 22:14:19 minskim Exp $
+$NetBSD: distinfo,v 1.21 2004/03/25 22:49:14 jlam Exp $
SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
-SHA1 (patch-aa) = 7615c4debc2ff76278b071d649695e1da9e5decd
-SHA1 (patch-ab) = dc45c2d9195aec8047ca132adab94e25c777931c
+SHA1 (patch-aa) = 5a8d4d6a14c3520cb9f46e65d826ee85f48b2c5b
+SHA1 (patch-ab) = 3032c2b97e69260827f9fec27553557572b9bdb4
SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
-SHA1 (patch-af) = b19b6df12335c89d7786c91a36460249a44c7fcf
+SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
+SHA1 (patch-ag) = d1b038f6006ef3611fec9d8cef314f8959a5cd08
diff -r 6670a8527404 -r 57ff2ee7759b lang/tcl/patches/patch-aa
--- a/lang/tcl/patches/patch-aa Thu Mar 25 22:45:27 2004 +0000
+++ b/lang/tcl/patches/patch-aa Thu Mar 25 22:49:14 2004 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2004/03/08 19:55:35 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
---- Makefile.in.orig 2003-11-21 14:17:14.000000000 -0600
+--- Makefile.in.orig Mon Mar 1 18:58:59 2004
+++ Makefile.in
-@@ -90,7 +90,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
- #CFLAGS = $(CFLAGS_DEBUG)
- #CFLAGS = $(CFLAGS_OPTIMIZE)
- #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
-+CFLAGS += @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
-
+@@ -95,7 +95,7 @@ CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DT
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
+-LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
++LDFLAGS = @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
+
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
@@ -172,8 +172,8 @@ SHELL = /bin/sh
INSTALL_STRIP_PROGRAM = -s
INSTALL_STRIP_LIBRARY = -S -S
diff -r 6670a8527404 -r 57ff2ee7759b lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Thu Mar 25 22:45:27 2004 +0000
+++ b/lang/tcl/patches/patch-ab Thu Mar 25 22:49:14 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
+$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
---- configure.orig 2004-03-01 17:58:59.000000000 -0600
+--- configure.orig Mon Mar 1 18:58:59 2004
+++ configure
@@ -5613,6 +5613,7 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -10,19 +10,136 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -6038,6 +6039,9 @@ fi
+@@ -5682,7 +5683,7 @@ fi
+ SHLIB_SUFFIX=".so"
+
+ DL_OBJS="tclLoadDl.o"
+- LDFLAGS=""
++ LD_FLAGS=""
+
+ LD_LIBRARY_PATH_VAR="LIBPATH"
+
+@@ -5693,7 +5694,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
+ AR="${AR} -X64"
+ SHLIB_LD_FLAGS="-b64"
+@@ -5734,7 +5735,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"
+@@ -5754,7 +5755,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
+ AR="${AR} -X64"
+ SHLIB_LD_FLAGS="-b64"
+@@ -5830,7 +5831,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -5841,7 +5842,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=""
+ ;;
+@@ -5852,7 +5853,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -5916,7 +5917,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"
+@@ -5952,10 +5953,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
+@@ -6009,7 +6010,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"
+@@ -6022,7 +6023,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'
+@@ -6037,7 +6038,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=""
-@@ -6063,6 +6067,9 @@ fi
+@@ -6050,7 +6054,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)
+@@ -6061,8 +6065,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 @@
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -6087,6 +6094,9 @@ fi
- LDFLAGS="-64"
+@@ -6071,7 +6078,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}'
+
+@@ -6084,9 +6091,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 @@
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
+@@ -6103,7 +6113,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
+@@ -6139,7 +6149,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
@@ -6168,6 +6178,9 @@ fi
EOF
@@ -50,7 +198,40 @@
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -6249,6 +6262,9 @@ fi
+@@ -6178,7 +6191,7 @@ EOF
+ SHLIB_LD="${CC} -shared"
+ DL_OBJS=""
+ DL_LIBS="-ldl"
+- LDFLAGS="-rdynamic"
++ LD_FLAGS="-rdynamic"
Home |
Main Index |
Thread Index |
Old Index