Check-in [021ebbd5e8]
Overview
Comment:Added support for the Thread package if asked to compile a threaded Tcl
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:021ebbd5e8c8865e84d1afc21900f00eecc424c8
User & Date: rkeene on 2010-09-26 04:41:28
Other Links: manifest | tags
Context
2010-09-26
04:41
Clarified licensing terms

Updated "clean"/"distclean" options to clean optional packages check-in: e251d16623 user: rkeene tags: trunk

04:41
Added support for the Thread package if asked to compile a threaded Tcl check-in: 021ebbd5e8 user: rkeene tags: trunk
04:41
Added support for specifying a STRIP environment variable check-in: d2e00f0f73 user: rkeene tags: trunk
Changes

Modified kitcreator from [b45aa7beb7] to [b2dce588fe].

    18     18   	shift
    19     19   
    20     20   	mode="distclean"
    21     21   fi
    22     22   
    23     23   CONFIGUREEXTRA="$@"
    24     24   export CONFIGUREEXTRA
           25  +
           26  +# Add packages implied by the additional arguments
           27  +if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then
           28  +	ADDPKGS="${ADDPKGS} thread"
           29  +fi
    25     30   
    26     31   failedpkgs=""
    27     32   buildfailed="0"
    28         -for pkg in tcl tk itcl mk4tcl tclvfs zlib kitsh; do
           33  +for pkg in tcl tk itcl mk4tcl tclvfs zlib ${ADDPKGS} kitsh; do
    29     34   	if [ "${mode}" = "distclean" ]; then
    30     35   		rm -rf "${pkg}/src"
    31     36   	fi
    32     37   
    33     38   	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
    34     39   		rm -f "${pkg}/build.log"
    35     40   		rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"

Added thread/build.sh version [6ffd493472].

            1  +#! /bin/bash
            2  +
            3  +if [ ! -f 'build.sh' ]; then
            4  +	echo 'ERROR: This script must be run from the directory it is in' >&2
            5  +
            6  +	exit 1
            7  +fi
            8  +if [ -z "${TCLVERS}" ]; then
            9  +	echo 'ERROR: The TCLVERS environment variable is not set' >&2
           10  +
           11  +	exit 1
           12  +fi
           13  +
           14  +THREADVERS="2.6.5"
           15  +SRC="src/thread-${THREADVERS}.tar.gz"
           16  +SRCURL="http://sourceforge.net/projects/tcl/files/Thread%20Extension/${THREADVERS}/thread${THREADVERS}.tar.gz/download"
           17  +BUILDDIR="$(pwd)/build/thread${THREADVERS}"
           18  +OUTDIR="$(pwd)/out"
           19  +INSTDIR="$(pwd)/inst"
           20  +export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
           21  +
           22  +rm -rf 'build' 'out' 'inst'
           23  +mkdir 'build' 'out' 'inst' || exit 1
           24  +
           25  +if [ ! -f "${SRC}" ]; then
           26  +	mkdir 'src' >/dev/null 2>/dev/null
           27  +
           28  +	rm -f "${SRC}.tmp"
           29  +	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           30  +	mv "${SRC}.tmp" "${SRC}"
           31  +fi
           32  +
           33  +(
           34  +	cd 'build' || exit 1
           35  +
           36  +	if [ ! -d '../buildsrc' ]; then
           37  +		gzip -dc "../${SRC}" | tar -xf -
           38  +	else    
           39  +		cp -rp ../buildsrc/* './'
           40  +	fi
           41  +
           42  +	cd "${BUILDDIR}" || exit 1
           43  +	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           44  +
           45  +	${MAKE:-make} || exit 1
           46  +
           47  +	${MAKE:-make} install
           48  +
           49  +	mkdir "${OUTDIR}/lib" || exit 1
           50  +	cp -r "${INSTDIR}/lib"/thread*/ "${OUTDIR}/lib/"
           51  +
           52  +	"${STRIP:-strip}" -g "${OUTDIR}"/lib/thread*/*.so >/dev/null 2>/dev/null
           53  +
           54  +	exit 0
           55  +) || exit 1
           56  +
           57  +exit 0