Check-in [da8fac4446]
Overview
SHA1:da8fac4446361f814c25f703d054ec8b15cab609
Date: 2015-10-28 15:28:02
User: rkeene
Comment:Updated to pass "--enable-threads" to sub-projects if a threaded Tcl is built, unless otherwise requested
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2015-10-28
15:28
[e2c7a97b27] Updated TLS package to 1.6.7, still needs lots of testing since the new TLS package is apparently really broken (user: rkeene, tags: trunk)
15:28
[da8fac4446] Updated to pass "--enable-threads" to sub-projects if a threaded Tcl is built, unless otherwise requested (user: rkeene, tags: trunk)
15:18
[6fa06ab16c] Added NSF package to web page (user: rkeene, tags: trunk)
Changes

Modified kitcreator from [f472cb4a86] to [4ae47ac847].

60
61
62
63
64
65
66

67


68
69
70
71
72
73
74
...
184
185
186
187
188
189
190







191
192
193
194
195
196
197
	KITCREATOR_PKGS="tk itcl mk4tcl"
fi

CONFIGUREEXTRA="$@"
export CONFIGUREEXTRA

if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then

	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"


fi

# Determine cross-compile status
host_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --host=\([^ ]*\) .*$@\1@
t x
d
:x')"
................................................................................
	fi

	case "${pkg}" in
		tcl)
			TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@')
			TCLCONFIGDIRTAIL="$(basename "${TCLCONFIGDIR}")"
			export TCLCONFIGDIR TCLCONFIGDIRTAIL







			;;
	esac

	if [ "${failed}" = "1" ]; then
		buildfailed="1"
	else
		touch "${pkg}/.success"







>

>
>







 







>
>
>
>
>
>
>







60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
...
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
	KITCREATOR_PKGS="tk itcl mk4tcl"
fi

CONFIGUREEXTRA="$@"
export CONFIGUREEXTRA

if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then
	KITCREATOR_ADD_ENABLE_THREADS='0'
	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
elif echo " ${CONFIGUREEXTRA} " | grep ' --disable-threads' >/dev/null 2>/dev/null; then
	KITCREATOR_ADD_ENABLE_THREADS='0'
fi

# Determine cross-compile status
host_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --host=\([^ ]*\) .*$@\1@
t x
d
:x')"
................................................................................
	fi

	case "${pkg}" in
		tcl)
			TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@')
			TCLCONFIGDIRTAIL="$(basename "${TCLCONFIGDIR}")"
			export TCLCONFIGDIR TCLCONFIGDIRTAIL

			# If Tcl was compiled with threads enabled pass --enable-threads to all sub-projects
			if [ "${KITCREATOR_ADD_ENABLE_THREADS:-1}" != '0' ]; then
				if [ "$( . "${TCLCONFIGDIR}/tclConfig.sh" && echo "${TCL_THREADS:-0}" )" = '1' ]; then
					CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-threads"
				fi
			fi
			;;
	esac

	if [ "${failed}" = "1" ]; then
		buildfailed="1"
	else
		touch "${pkg}/.success"