Check-in [4f2db7cae0]
Overview
Comment:Added patch for Tcl 8.4.19 to compile with newer versions of GCC
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:4f2db7cae09ecfc7de64bb4305a7adddebde339f
User & Date: rkeene on 2010-10-12 15:56:10
Other Links: manifest | tags
Context
2010-10-12
16:13
Added registry test check-in: 9fb27167af user: rkeene tags: trunk
15:56
Added patch for Tcl 8.4.19 to compile with newer versions of GCC check-in: 4f2db7cae0 user: rkeene tags: trunk
01:49
Updated to allow force rebuilds of nightly tests check-in: ad21154bd8 user: rkeene tags: trunk
Changes

Modified tcl/build.sh from [0f3c234f4e] to [805b596118].

    13     13   
    14     14   SRC="src/tcl${TCLVERS}.tar.gz"
    15     15   SRCURL="http://prdownloads.sourceforge.net/tcl/tcl${TCLVERS}-src.tar.gz"
    16     16   BUILDDIR="$(pwd)/build/tcl${TCLVERS}"
    17     17   OUTDIR="$(pwd)/out"
    18     18   INSTDIR="$(pwd)/inst"
    19     19   PATCHSCRIPTDIR="$(pwd)/patchscripts"
    20         -export SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR
           20  +PATCHDIR="$(pwd)/patches"
           21  +export SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR
    21     22   
    22     23   rm -rf 'build' 'out' 'inst'
    23     24   mkdir 'build' 'out' 'inst' || exit 1
    24     25   
    25     26   if [ ! -f "${SRC}" ]; then
    26     27   	mkdir 'src' >/dev/null 2>/dev/null
    27     28   
................................................................................
    51     52   	if [ ! -d '../buildsrc' ]; then
    52     53   		gzip -dc "../${SRC}" | tar -xf -
    53     54   	else
    54     55   		cp -rp ../buildsrc/* './'
    55     56   	fi
    56     57   
    57     58   	cd "${BUILDDIR}" || exit 1
           59  +
           60  +	# Apply patches if needed
           61  +	for patch in "${PATCHDIR}/all"/tcl-${TCLVERS}-*.diff "${PATCHDIR}/${TCLVERS}"/tcl-${TCLVERS}-*.diff; do
           62  +		if [ ! -f "${patch}" ]; then
           63  +			continue
           64  +		fi
           65  +                
           66  +		echo "Applying: ${patch}"
           67  +		${PATCH:-patch} -p1 < "${patch}"
           68  +	done
           69  +
    58     70   
    59     71   	# Apply patch scripts if needed
    60     72   	for patchscript in "${PATCHSCRIPTDIR}"/*.sh; do
    61     73   		if [ -f "${patchscript}" ]; then
    62     74   			echo "Running patch script: ${patchscript}"
    63     75   
    64     76   			(

Added tcl/patches/8.4.19/tcl-8.4.19-win32castingfailure-1rsk.diff version [15d3e2419e].

            1  +diff -uNr tcl8.4.19.orig/win/tclWinDde.c tcl8.4.19-1rsk/win/tclWinDde.c
            2  +--- tcl8.4.19.orig/win/tclWinDde.c	2006-04-05 15:50:46.000000000 -0500
            3  ++++ tcl8.4.19-1rsk/win/tclWinDde.c	2010-10-12 10:40:23.000000000 -0500
            4  +@@ -1308,7 +1308,7 @@
            5  + 	    }
            6  + 
            7  + 	    objc -= (async + 3);
            8  +-	    ((Tcl_Obj **) objv) += (async + 3);
            9  ++	    objv += (async + 3);
           10  + 
           11  +             /*
           12  + 	     * See if the target interpreter is local.  If so, execute
           13  +diff -uNr tcl8.4.19.orig/win/tclWinReg.c tcl8.4.19-1rsk/win/tclWinReg.c
           14  +--- tcl8.4.19.orig/win/tclWinReg.c	2007-05-15 11:08:22.000000000 -0500
           15  ++++ tcl8.4.19-1rsk/win/tclWinReg.c	2010-10-12 10:40:20.000000000 -0500
           16  +@@ -790,7 +790,7 @@
           17  + 		    Tcl_NewStringObj(Tcl_DStringValue(&buf),
           18  + 			    Tcl_DStringLength(&buf)));
           19  + 	    if (regWinProcs->useWide) {
           20  +-		while (*((Tcl_UniChar *)p)++ != 0) {}
           21  ++		while ((*((Tcl_UniChar *)p))++ != 0) {}
           22  + 	    } else {
           23  + 		while (*p++ != '\0') {}
           24  + 	    }