Check-in [b218be3c25]
Overview
Comment:Updated to build Tcl for linking against globally instead of just for TclX
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:b218be3c2500d0ff19bfc4fd608c283f8ab34fc0
User & Date: rkeene on 2010-02-06 22:09:16
Other Links: manifest | tags
Context
2010-02-06
22:37
Added dict package Made tls package more consistent with other packages check-in: 65ce01732d user: rkeene tags: trunk
22:09
Updated to build Tcl for linking against globally instead of just for TclX check-in: b218be3c25 user: rkeene tags: trunk
21:21
Added support for building Tcl when linking against it check-in: 4f7df8a8e2 user: rkeene tags: trunk
Changes

Modified .fossil-settings/ignore-glob from [c9334bfc6e] to [2fd4b024af].

     2      2   client/teapot-client.kit/*
     3      3   server/buildpkgs/Tclx/build
     4      4   server/buildpkgs/Tclx/build/*
     5      5   server/buildpkgs/Tclx/out
     6      6   server/buildpkgs/Tclx/out/*
     7      7   server/buildpkgs/Tclx/src
     8      8   server/buildpkgs/Tclx/src/*
            9  +server/buildpkgs/tcl
           10  +server/buildpkgs/tcl/*
     9     11   server/buildpkgs/tclpkgs-*.tar.*
    10     12   server/buildpkgs/tclpkgs-*.tar.*/*
    11     13   server/buildpkgs/tls/build
    12     14   server/buildpkgs/tls/build/*
    13     15   server/buildpkgs/tls/out
    14     16   server/buildpkgs/tls/out/*
    15     17   server/buildpkgs/tls/src
    16     18   server/buildpkgs/tls/src/*
    17     19   server/pkgs
    18     20   server/pkgs/*

Modified server/buildpkgs/Tclx/build.sh from [7bcc2fd890] to [efebbc9ef2].

    22     22   ) || exit 1
    23     23   
    24     24   if [ ! -f "${SRC}" ]; then
    25     25   	mkdir src >/dev/null 2>/dev/null
    26     26   
    27     27   	wget -O "${SRC}" "${SRCURL}" || exit 1
    28     28   fi
    29         -
    30         -TCLPRIVATE="${TCLCONFIGDIR}/../include/tcl-private"
    31         -if [ ! -d "${TCLPRIVATE}" ]; then
    32         -	if [ ! -f src/tcl8.4.19.tar.gz ]; then
    33         -		wget -O src/tcl8.4.19.tar.gz http://prdownloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz
    34         -	fi
    35         -
    36         -	(
    37         -		mkdir build >/dev/null 2>/dev/null
    38         -		cd build || exit 1
    39         -		gzip -dc ../src/tcl8.4.19.tar.gz | tar -xf -
    40         -	)
    41         -
    42         -	TCLPRIVATE="$(pwd)/build/tcl8.4.19"
    43         -	export TCLPRIVATE
    44         -
    45         -	(
    46         -		cd "${TCLPRIVATE}/unix" || exit 1
    47         -
    48         -		./configure
    49         -
    50         -		${MAKE:-make}
    51         -	)
    52         -
    53         -	TCLCONFIGDIR="${TCLPRIVATE}/unix"
    54         -fi
    55         -echo "TCLPRIVATE = \"${TCLPRIVATE}\""
    56         -CFLAGS="-I${TCLPRIVATE} -I${TCLPRIVATE}/generic -I${TCLPRIVATE}/unix ${CFLAGS}"
    57         -export CFLAGS
    58         -
    59     29   
    60     30   (
    61     31   	cd build/ || exit 1
    62     32   
    63     33   	bzip2 -dc "../${SRC}" | tar -xf -
    64     34   	cd "${BUILDDIR}" || exit 1
    65     35   

Modified server/buildpkgs/build_all.sh from [15c7c52166] to [b9b3d01220].

    14     14   if [ "$1" = "distclean" ]; then
    15     15   	CLEANONLY=1
    16     16   	DISTCLEAN=1
    17     17   fi
    18     18   export CLEANONLY DISTCLEAN
    19     19   
    20     20   # Determine path to "tclConfig.sh"
    21         -TCLCONFIGDIR=$(
    22         -	(
    23         -		echo "${LD_LIBRARY_PATH}" | tr ':' "\n"
    24         -		cat /etc/ld.so.conf 2>/dev/null
    25         -		crle 2>/dev/null | grep '^ *Default Library Path' | sed 's@^ *Default Library Path[^:]*:[^:]*/@/@' | tr ':' "\n"
    26         -	) | grep '^/' | while read chklibdir; do
    27         -		if [ -f "${chklibdir}/tclConfig.sh" ]; then
    28         -			echo "${chklibdir}"
    29         -			break
    30         -		fi
    31         -	done
    32         -)
    33         -if [ -z "${TCLCONFIGDIR}" ]; then
    34         -	TCLCONFIGDIR="/usr/lib"
           21  +rm -rf tcl/build
           22  +if [ "${DISTCLEAN}" = "1" ]; then
           23  +	rm -rf tcl
    35     24   fi
    36         -export TCLCONFIGDIR
           25  +
           26  +if [ "${CLEANONLY}" = "0" ]; then
           27  +	TCLVERS="8.4.19"
           28  +	TCLPRIVATE="$(pwd)/tcl/build/tcl${TCLVERS}"
           29  +
           30  +	mkdir tcl tcl/build >/dev/null 2>/dev/null
           31  +
           32  +	if [ ! -f "tcl/src/tcl${TCLVERS}.tar.gz" ]; then
           33  +		mkdir tcl/src >/dev/null 2>/dev/null
           34  +		wget -o /dev/null -O "tcl/src/tcl${TCLVERS}.tar.gz" "http://prdownloads.sourceforge.net/tcl/tcl${TCLVERS}-src.tar.gz"
           35  +	fi
           36  +
           37  +	echo "Building Tcl ${TCLVERS}"
           38  +	(
           39  +		mkdir tcl/build >/dev/null 2>/dev/null
           40  +		cd tcl/build || exit 1
           41  +		gzip -dc "../src/tcl${TCLVERS}.tar.gz" | tar -xf -
           42  +
           43  +		cd "${TCLPRIVATE}/unix" || exit 1
           44  +
           45  +		./configure --enable-shared
           46  +
           47  +		${MAKE:-make}
           48  +	) > "tcl/build/build.log" 2>&1
           49  +
           50  +	if [ -d "${TCLPRIVATE}" -a -f "${TCLPRIVATE}/unix/tclConfig.sh" ]; then
           51  +		TCLCONFIGDIR="${TCLPRIVATE}/unix"
           52  +	else
           53  +		unset TCLPRIVATE
           54  +
           55  +		TCLCONFIGDIR=$(
           56  +			(
           57  +				echo "${LD_LIBRARY_PATH}" | tr ':' "\n"
           58  +				cat /etc/ld.so.conf 2>/dev/null
           59  +				crle 2>/dev/null | grep '^ *Default Library Path' | sed 's@^ *Default Library Path[^:]*:[^:]*/@/@' | tr ':' "\n"
           60  +			) | grep '^/' | while read chklibdir; do
           61  +				if [ -f "${chklibdir}/tclConfig.sh" ]; then
           62  +					echo "${chklibdir}"
           63  +					break
           64  +				fi
           65  +			done
           66  +		)
           67  +		if [ -z "${TCLCONFIGDIR}" ]; then
           68  +			TCLCONFIGDIR="/usr/lib"
           69  +		fi
           70  +
           71  +		TCLPRIVATE="${TCLCONFIGDIR}/../include/tcl-private"
           72  +	fi
           73  +
           74  +	ADDFLAGS="-I${TCLPRIVATE} -I${TCLPRIVATE}/generic -I${TCLPRIVATE}/unix"
           75  +	CFLAGS="${ADDFLAGS} ${CFLAGS}"
           76  +	CPPFLAGS="${ADDFLAGS} ${CPPFLAGS}"
           77  +
           78  +	unset TCLVERS
           79  +	unset ADDFLAGS
           80  +	export TCLCONFIGDIR TCLPRIVATE CFLAGS CPPFLAGS
           81  +fi
    37     82   
    38     83   # Determine platform
    39     84   PLATFORM="$(./platform)"
    40     85   export PLATFORM
    41     86   
    42     87   # Build all appropriate directories
    43     88   faileddirs=""