Check-in [0ed07039ad]
Overview
Comment:Updated to check to see if required before building
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0ed07039adcbfa801645b7bd57420eab521823d6
User & Date: rkeene on 2010-09-26 04:45:28
Other Links: manifest | tags
Context
2010-09-26
04:45
Updated to set sane defaults if we are unable to load the requested encoding check-in: e598e77805 user: rkeene tags: trunk
04:45
Updated to check to see if required before building check-in: 0ed07039ad user: rkeene tags: trunk
04:45
Updated to set encoding from system (untested) check-in: 095125b887 user: rkeene tags: trunk
Changes

Modified thread/build.sh from [6ffd493472] to [d1e307e2c4].

    17     17   BUILDDIR="$(pwd)/build/thread${THREADVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    21     21   
    22     22   rm -rf 'build' 'out' 'inst'
    23     23   mkdir 'build' 'out' 'inst' || exit 1
           24  +
           25  +# Determine if Threads is even needed
           26  +(
           27  +	TCL_VERSION="unknown"
           28  +	if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then
           29  +		source "${TCLCONFIGDIR}/tclConfig.sh"
           30  +	fi
           31  +
           32  +	if echo "${TCL_VERSION}" | grep '^8\.[45]$' >/dev/null; then
           33  +		# Threads may be required for Tcl 8.4 and Tcl 8.5
           34  +
           35  +                exit 0
           36  +        fi
           37  +
           38  +	if [ "${TCL_VERSION}" = "unknown" ]; then
           39  +		# If we dont know what version of Tcl we are building, build
           40  +		# Threads just in case.
           41  +
           42  +		exit 0
           43  +	fi
           44  +
           45  +	# All other versions do not require Threads
           46  +	echo "Skipping building Threads, not required for ${TCL_VERSION}"
           47  +	exit 1
           48  +) || exit 0
    24     49   
    25     50   if [ ! -f "${SRC}" ]; then
    26     51   	mkdir 'src' >/dev/null 2>/dev/null
    27     52   
    28     53   	rm -f "${SRC}.tmp"
    29     54   	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
    30     55   	mv "${SRC}.tmp" "${SRC}"
................................................................................
    31     56   fi
    32     57   
    33     58   (
    34     59   	cd 'build' || exit 1
    35     60   
    36     61   	if [ ! -d '../buildsrc' ]; then
    37     62   		gzip -dc "../${SRC}" | tar -xf -
    38         -	else    
           63  +	else
    39     64   		cp -rp ../buildsrc/* './'
    40     65   	fi
    41     66   
    42     67   	cd "${BUILDDIR}" || exit 1
    43     68   	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    44     69   
    45     70   	${MAKE:-make} || exit 1