From 62f5a980a4904e45a4f86b4939e30e76de7538f0 Mon Sep 17 00:00:00 2001 From: seb Date: Tue, 2 Aug 2005 22:37:18 +0000 Subject: Patches and tuning so the test target runs and pass, at least on NetBSD/i386 2.0_STABLE and current: set timezone in TEST_ENV, use libtool to compile shared test modules and account for that in the Tcl test scripts. Thanks to jwise@ for the helping hand. --- lang/tcl/Makefile | 5 ++++- lang/tcl/distinfo | 5 ++++- lang/tcl/patches/patch-ad | 52 +++++++++++++++++++++++++++++++++++++++++++++++ lang/tcl/patches/patch-ai | 13 ++++++++++++ lang/tcl/patches/patch-aj | 31 ++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 lang/tcl/patches/patch-ad create mode 100644 lang/tcl/patches/patch-ai create mode 100644 lang/tcl/patches/patch-aj (limited to 'lang/tcl') diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 5ec2d29ec2b..e42f03d482d 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.52 2005/08/02 22:37:18 seb Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} @@ -22,7 +22,10 @@ GNU_CONFIGURE= yes MAKE_ENV+= TOUCH="${TOUCH}" INSTALL_TARGET= install + +# The test target gives better results when not run as root. TEST_TARGET= test +TEST_ENV+= TZ=+0 # Initially install the man pages into ${WRKDIR}/man, as we need a staged # install to avoid overwriting existing manpages in ${PREFIX}/man. diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 8c5dec05e4e..f9ae66ad90f 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2005/07/19 11:11:58 adam Exp $ +$NetBSD: distinfo,v 1.33 2005/08/02 22:37:18 seb Exp $ SHA1 (tcl8.4.11-src.tar.gz) = 4580adcbdcb7d09fd9a8ae8fbe61c592a56bfa9e RMD160 (tcl8.4.11-src.tar.gz) = 933dda739859af170c31cef855409f861ed597cb @@ -6,7 +6,10 @@ Size (tcl8.4.11-src.tar.gz) = 3474428 bytes SHA1 (patch-aa) = c41a554996965c9ceaf639ce54841c8861ac8ba2 SHA1 (patch-ab) = 7107fca2f0269ce90ea076c6be6dd45ccda3bc0b SHA1 (patch-ac) = bc746ec3c8fc50c56d4827540d6a8b2fffda78ad +SHA1 (patch-ad) = 54947660216280726ee9ec213995063fa428f560 SHA1 (patch-ae) = d5b7c01873c9d092bcdea5ea37b407bbd865f22d SHA1 (patch-af) = 427a6baa9494f1eeb9148584436af3a8162fbbf5 SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb +SHA1 (patch-ai) = ef8939597e759a95ca869f93e251df76d9c660f9 +SHA1 (patch-aj) = 3e6844bce3e9c15100dd53ef4c8fb715ffebf1c9 diff --git a/lang/tcl/patches/patch-ad b/lang/tcl/patches/patch-ad new file mode 100644 index 00000000000..d5bc49cb61e --- /dev/null +++ b/lang/tcl/patches/patch-ad @@ -0,0 +1,52 @@ +$NetBSD: patch-ad,v 1.3 2005/08/02 22:37:18 seb Exp $ + +--- dltest/Makefile.in.orig 2004-09-23 20:04:07.000000000 +0000 ++++ dltest/Makefile.in +@@ -5,11 +5,11 @@ + + TCL_DBGX = @TCL_DBGX@ +-CC = @CC@ ++CC = ${LIBTOOL} --mode=compile @CC@ + LIBS = @TCL_BUILD_STUB_LIB_SPEC@ @DL_LIBS@ @LIBS@ @MATH_LIBS@ + AC_FLAGS = @DEFS@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = ${LIBTOOL} --mode=link cc -module -pipe -rpath ${PREFIX}/lib + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ +-SHLIB_SUFFIX = @SHLIB_SUFFIX@ ++SHLIB_SUFFIX = .la + SRC_DIR = @srcdir@ + TCL_VERSION= @TCL_VERSION@ +@@ -27,25 +27,26 @@ all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUF + pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c + $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c +- ${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${SHLIB_LD_LIBS} ++ ${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.lo ${SHLIB_LD_LIBS} + + pkgb${SHLIB_SUFFIX}: $(SRC_DIR)/pkgb.c + $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c +- ${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS} ++ ${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.lo ${SHLIB_LD_LIBS} + + pkgc${SHLIB_SUFFIX}: $(SRC_DIR)/pkgc.c + $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c +- ${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS} ++ ${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.lo ${SHLIB_LD_LIBS} + + pkgd${SHLIB_SUFFIX}: $(SRC_DIR)/pkgd.c + $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c +- ${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS} ++ ${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.lo ${SHLIB_LD_LIBS} + + pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c + $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c +- ${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS} ++ ${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.lo ${SHLIB_LD_LIBS} + + clean: +- rm -f *.o config.cache config.log config.status ++ rm -f *.o *.lo config.cache config.log config.status + rm -f lib.exp ../dltest.marker ++ rm -rf .libs + @if test "$(SHLIB_SUFFIX)" != ""; then \ + echo "rm -f *${SHLIB_SUFFIX}" ; \ diff --git a/lang/tcl/patches/patch-ai b/lang/tcl/patches/patch-ai new file mode 100644 index 00000000000..3686e4deefa --- /dev/null +++ b/lang/tcl/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2005/08/02 22:37:18 seb Exp $ + +--- ../tests/load.test.orig 2004-09-14 17:02:56.000000000 +0000 ++++ ../tests/load.test +@@ -28,7 +28,7 @@ if {$tcl_platform(platform) == "macintos + + # Tests require the existence of one of the DLLs in the dltest directory. + set ext [info sharedlibextension] +-set testDir [file join [file dirname [info nameofexecutable]] dltest] ++set testDir [file join [file dirname [info nameofexecutable]] .. dltest .libs ] + set x [file join $testDir pkga$ext] + set dll "[file tail $x]Required" + ::tcltest::testConstraint $dll [file readable $x] diff --git a/lang/tcl/patches/patch-aj b/lang/tcl/patches/patch-aj new file mode 100644 index 00000000000..f250662124a --- /dev/null +++ b/lang/tcl/patches/patch-aj @@ -0,0 +1,31 @@ +$NetBSD: patch-aj,v 1.1 2005/08/02 22:37:18 seb Exp $ + +--- ../tests/pkgMkIndex.test.orig 2003-07-24 08:23:39.000000000 +0000 ++++ ../tests/pkgMkIndex.test +@@ -559,7 +559,7 @@ removeFile [file join pkg circ2.tcl] + removeFile [file join pkg circ3.tcl] + + # Some tests require the existence of one of the DLLs in the dltest directory +-set x [file join [file dirname [info nameofexecutable]] dltest \ ++set x [file join [file dirname [info nameofexecutable]] .. dltest .libs \ + pkga[info sharedlibextension]] + set dll "[file tail $x]Required" + ::tcltest::testConstraint $dll [file exists $x] +@@ -572,7 +572,7 @@ proc pkga_neq { x } { + return [expr {! [pkgq_eq $x]}] + } + } [file join pkg pkga.tcl] +-file copy -force $x $fullPkgPath ++eval file copy -force [glob "$x*"] $fullPkgPath + } + testConstraint exec [llength [info commands ::exec]] + +@@ -598,7 +598,7 @@ test pkgMkIndex-10.2 {package in DLL hid + } {0 {}} + + if {[testConstraint $dll]} { +-file delete -force [file join $fullPkgPath [file tail $x]] ++eval file delete -force [glob [file join $fullPkgPath [file tail "$x*"] ] ] + removeFile [file join pkg pkga.tcl] + } + -- cgit v1.2.3