Index: README ================================================================== --- README +++ README @@ -148,10 +148,16 @@ 11. KITCREATOR_STATIC_KITDLL Set this variable to the value "1" to build a static KitDLL. This only has an affect when KITCREATOR_PKGS specifies that "kitdll" is to be built (e.g., KITCREATOR_PKGS='kitdll') + + 12. KITCREATOR_ITCL3_FORCE + Set this variable to the value "1" to build [incr Tcl] version + 3.x even with Tcl 8.6+. Note that [incr Tcl] 4.x will still + be built as part of Tcl 8.6+ (unless excluded using + KITCREATOR_MINBUILD). Cross compiling Environment Variables: 1. CC Index: itcl/build.sh ================================================================== --- itcl/build.sh +++ itcl/build.sh @@ -9,15 +9,15 @@ echo 'ERROR: The TCLVERS environment variable is not set' >&2 exit 1 fi -ITCLVERS="3.4.2" +ITCLVERS="3.4.3" ITCLVERSEXTRA="" SRC="src/itcl-${ITCLVERS}.tar.gz" -SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download" -SRCHASH='-' +SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/Itcl%20${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download" +SRCHASH='28b55f44a2fd450862a6f12982c00c1d03d767f62a834d83945a616e06068887' BUILDDIR="$(pwd)/build/itcl${ITCLVERS}" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR @@ -31,10 +31,15 @@ rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 # Determine if Itcl is even needed ( + # Always build if we are being forced to build + if [ "${KITCREATOR_ITCL3_FORCE}" = '1' ]; then + exit 0 + fi + TCL_VERSION="unknown" if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then source "${TCLCONFIGDIR}/tclConfig.sh" fi