Overview
| Comment: | Updated to pass "--enable-threads" to sub-projects if a threaded Tcl is built, unless otherwise requested |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | da8fac4446361f814c25f703d054ec8b15cab609 |
| User & Date: | rkeene on 2015-10-28 15:28:02 |
| Other Links: | manifest | tags |
Context
|
2015-10-28
| ||
| 15:28 | Updated TLS package to 1.6.7, still needs lots of testing since the new TLS package is apparently really broken check-in: e2c7a97b27 user: rkeene tags: trunk | |
| 15:28 | Updated to pass "--enable-threads" to sub-projects if a threaded Tcl is built, unless otherwise requested check-in: da8fac4446 user: rkeene tags: trunk | |
| 15:18 | Added NSF package to web page check-in: 6fa06ab16c user: rkeene tags: trunk | |
Changes
Modified kitcreator from [f472cb4a86] to [4ae47ac847].
60 60 KITCREATOR_PKGS="tk itcl mk4tcl" 61 61 fi 62 62 63 63 CONFIGUREEXTRA="$@" 64 64 export CONFIGUREEXTRA 65 65 66 66 if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then 67 + KITCREATOR_ADD_ENABLE_THREADS='0' 67 68 KITCREATOR_PKGS="${KITCREATOR_PKGS} thread" 69 +elif echo " ${CONFIGUREEXTRA} " | grep ' --disable-threads' >/dev/null 2>/dev/null; then 70 + KITCREATOR_ADD_ENABLE_THREADS='0' 68 71 fi 69 72 70 73 # Determine cross-compile status 71 74 host_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --host=\([^ ]*\) .*$@\1@ 72 75 t x 73 76 d 74 77 :x')" ................................................................................ 184 187 fi 185 188 186 189 case "${pkg}" in 187 190 tcl) 188 191 TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@') 189 192 TCLCONFIGDIRTAIL="$(basename "${TCLCONFIGDIR}")" 190 193 export TCLCONFIGDIR TCLCONFIGDIRTAIL 194 + 195 + # If Tcl was compiled with threads enabled pass --enable-threads to all sub-projects 196 + if [ "${KITCREATOR_ADD_ENABLE_THREADS:-1}" != '0' ]; then 197 + if [ "$( . "${TCLCONFIGDIR}/tclConfig.sh" && echo "${TCL_THREADS:-0}" )" = '1' ]; then 198 + CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-threads" 199 + fi 200 + fi 191 201 ;; 192 202 esac 193 203 194 204 if [ "${failed}" = "1" ]; then 195 205 buildfailed="1" 196 206 else 197 207 touch "${pkg}/.success"