KitCreator
Check-in [e49dbb5c95]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Better handling of host platform detection
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e49dbb5c957e33c148125b13249c2e5d004e159c
User & Date: rkeene on 2019-01-22 22:57:48
Other Links: manifest | tags
Context
2019-02-02
16:40
Updated to find all packages automatically check-in: c0c1150d58 user: rkeene tags: trunk
2019-01-22
22:57
Better handling of host platform detection check-in: e49dbb5c95 user: rkeene tags: trunk
22:52
Slightly better handling of linkadd, may need to make this more generic in the future check-in: 73ac42ec6a user: rkeene tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified kitcreator from [dd4b10f457] to [2f1c1a9b4c].

︙
71
72
73
74
75
76
77

78
79
80
81
82
83
84
85











86
87
88
89
90
91
92
93

94

95
96
97
98
99
100
101

71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100

101
102

103
104
105
106
107
108
109
110
111
112
113








+








+
+
+
+
+
+
+
+
+
+
+



-


-

+

+








	KITCREATOR_ADD_ENABLE_THREADS='1'
	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
kitsh_dir="$(cd kitsh/buildsrc/kitsh-* && pwd)" || exit 1
host_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --host=\([^ ]*\) .*$@\1@
t x
d
:x')"
build_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --build=\([^ ]*\) .*$@\1@
t x
d
:x')"

if [ -z "${build_os}" ]; then
	build_os="$("${kitsh_dir}/config.guess")"
else
	build_os="$("${kitsh_dir}/config.sub" "${build_os}")"
fi
if [ -z "${host_os}" ]; then
	host_os="$("${kitsh_dir}/config.guess")"
else
	host_os="$("${kitsh_dir}/config.sub" "${host_os}")"
fi

if [ "${host_os}" != "${build_os}" -a -n "${host_os}" ]; then
	KC_CROSSCOMPILE='1'
	KC_CROSSCOMPILE_HOST_OS="${host_os}"
else
	KC_CROSSCOMPILE='0'
	KC_CROSSCOMPILE_HOST_OS=''
fi
KC_CROSSCOMPILE_HOST_OS="${host_os}"
export KC_CROSSCOMPILE KC_CROSSCOMPILE_HOST_OS
unset kitsh_dir

# Set default target
KITTARGET="kitsh"
export KITTARGET

# Fix up package list
## If building KitDLL, define it as our target
︙

Modified lmdb/build.sh from [2f79707b46] to [7fd6c7121b].

︙
8
9
10
11
12
13
14
15
16
17
18
19
20





21
22
23
24
25
26
27
28
29
30
31
32
33
34

8
9
10
11
12
13
14






15
16
17
18
19







20
21
22
23
24
25
26








-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-









function postinstall() {
	local name
	local isWindows

	# Windows-only
	isWindows='false'
	if [ "${KC_CROSSCOMPILE}" = '1' ]; then
		case "${KC_CROSSCOMPILE_HOST_OS}" in
			*-cygwin|*-mingw32|*-mingw32-*|*-cygwin-*)
				isWindows='true'
				;;
		esac
	case "${KC_CROSSCOMPILE_HOST_OS}" in
		*-cygwin|*-mingw32|*-mingw32-*|*-cygwin-*)
			isWindows='true'
			;;
	esac
	else
		case "${OSTYPE}" in
			msys|win*|cygwin)
				isWindows='true'
				;;
		esac
	fi

	if [ "${isWindows}" = 'true' ]; then
		find "${installdir}" -type -f -name '*.a' | while IFS='' read -r name; do
			echo '-lntdll' > "${name}.linkadd"
		done
	fi
}

Powered by Fossil · RSS