Check-in [4d18f784a8]
Overview
Comment:Updated to support MUSL better
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4d18f784a8d83bfc2cd1852be29c194144e82ad2
User & Date: rkeene on 2014-08-31 19:43:50
Other Links: manifest | tags
Context
2014-08-31
19:44
tcc4tcl 0.23 check-in: e5a7a25b38 user: rkeene tags: trunk, 0.23
19:43
Updated to support MUSL better check-in: 4d18f784a8 user: rkeene tags: trunk
2014-07-19
06:17
More additional comments check-in: 57b7fc959d user: rkeene tags: trunk
Changes

Modified build/autogen.sh from [95541498bc] to [a32990e3be].

19
20
21
22
23
24
25







done

aclocal -I aclocal
autoconf
automake -fca

rm -rf autom4te.cache














>
>
>
>
>
>
>
19
20
21
22
23
24
25
26
27
28
29
30
31
32
done

aclocal -I aclocal
autoconf
automake -fca

rm -rf autom4te.cache

# Add Linux/MUSL support if missing
if ! grep '[-]musl' config.sub >/dev/null 2>/dev/null; then
	sed 's@\(-*\)linux-gnu\* @\1linux-musl | &@g' config.sub > config.sub.new
	cat config.sub.new > config.sub
	rm -f config.sub.new
fi

Modified build/build-platform from [1ca5386209] to [9efba155e4].

20
21
22
23
24
25
26
27








28

29
30
31
32
33
34
35

36
37
38
39
40
41
42
43
44
45









46
47
48
49
50
51
52

		echo "No such platform: ${platform}" >&2

		exit 1
	fi

	dir="$(echo "${dir}" | sed 's@/$@@')"
	dir_platform="$(basename "${dir}-" | sed 's@^libtclkit-[^-]*-@@;s@-notk-@-@g;s@-xcompile-@-@g;s@-kitdll-@-@;s@-sdk-@-@g;s@-$@@')"










	if [ -z "${platform}" ]; then
		echo "  $dir_platform"
	else
		if [ "${dir_platform}" = "${platform}" ]; then
			break
		fi
	fi

done
dir="$(pwd)/${dir}"

case "${platform}" in
	native)
		platform=''
		;;
	linux-i386)
		platform="x86_64-redhat5-linux 32"
		;;









	linux-mipsel)
		platform="mipsel-unknown-linux-uclibc"
		;;
	solaris-amd64)
		platform="i386-pc-solaris2.10 64"
		;;
	solaris-i386)







|
>
>
>
>
>
>
>
>

>
|
|
|
|
|
|
|
>










>
>
>
>
>
>
>
>
>







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71

		echo "No such platform: ${platform}" >&2

		exit 1
	fi

	dir="$(echo "${dir}" | sed 's@/$@@')"
	dir_platform_in="$(basename "${dir}-" | sed 's@^libtclkit-[^-]*-@@;s@-notk-@-@g;s@-xcompile-@-@g;s@-kitdll-@-@;s@-sdk-@-@g;s@-$@@')"
	case "${dir_platform_in}" in
		linux-i386|linux-amd64)
			dir_platforms=("${dir_platform_in}" "${dir_platform_in}-static")
			;;
		*)
			dir_platforms=("${dir_platform_in}")
			;;
	esac

	for dir_platform in "${dir_platforms[@]}"; do
		if [ -z "${platform}" ]; then
			echo "  $dir_platform"
		else
			if [ "${dir_platform}" = "${platform}" ]; then
				break 2
			fi
		fi
	done
done
dir="$(pwd)/${dir}"

case "${platform}" in
	native)
		platform=''
		;;
	linux-i386)
		platform="x86_64-redhat5-linux 32"
		;;
	linux-i386-static)
		platform="x86_64-unknown-linux-musl 32"
		;;
	linux-amd64)
		platform="x86_64-redhat5-linux 64"
		;;
	linux-amd64-static)
		platform="x86_64-unknown-linux-musl 64"
		;;
	linux-mipsel)
		platform="mipsel-unknown-linux-uclibc"
		;;
	solaris-amd64)
		platform="i386-pc-solaris2.10 64"
		;;
	solaris-i386)
105
106
107
108
109
110
111
112
113
114
115
116
117
	x86_64-w64-mingw32)
		WINEPREFIX="${HOME}/.wine64"
		export WINEPREFIX

		make TCLSH="wine64 ${dir}/lib/tclsh.exe" test
		;;
	x86_64-redhat5-linux)
		make TCLSH="${dir}/lib/tclsh" test
		;;
	'')
		make test
		;;
esac







|





124
125
126
127
128
129
130
131
132
133
134
135
136
	x86_64-w64-mingw32)
		WINEPREFIX="${HOME}/.wine64"
		export WINEPREFIX

		make TCLSH="wine64 ${dir}/lib/tclsh.exe" test
		;;
	x86_64-redhat5-linux)
		make TCLSH="LD_LIBRARY_PATH=${dir}/lib ${dir}/lib/tclsh" test
		;;
	'')
		make test
		;;
esac