Check-in [3f0396eb30]
Overview
Comment:Correctly setup pkg-config
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:3f0396eb3085e51f92849de66d7c5a15b74ff6bf
User & Date: rkeene on 2019-06-19 18:39:26
Other Links: manifest | tags
Context
2019-06-19
18:39
Renamed noextern script to be more appropriate Leaf check-in: ec1baaf189 user: rkeene tags: trunk
18:39
Correctly setup pkg-config check-in: 3f0396eb30 user: rkeene tags: trunk
18:36
Deal with LIB files better check-in: e46c4439b2 user: rkeene tags: trunk
Changes

Modified build/make-kit-crosscompile from [da80a8dfaa] to [ab7302790e].

15
16
17
18
19
20
21





22
23
24
25
26
27
28
CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
if [ -z "${STRIP}" ]; then
	STRIP="${CCROOTBIN}/${CROSS}-strip"
fi
export PATH AR CC CXX RANLIB STRIP






# When cross-compiling Tcl it cannot detect these things and so assumes failure
# This in turn creates linking issues because it will define the replacements
# in the main library and stubs library, which we may both link to
ac_cv_func_memcmp_working=yes
tcl_cv_strstr_unbroken=ok
tcl_cv_strtoul_unbroken=ok
tcl_cv_strtod_unbroken=ok







>
>
>
>
>







15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
if [ -z "${STRIP}" ]; then
	STRIP="${CCROOTBIN}/${CROSS}-strip"
fi
export PATH AR CC CXX RANLIB STRIP

PKG_CONFIG_PATH='/dev/null/null'
PKG_CONFIG_DIR='/dev/null/null';
PKG_CONFIG_LIBDIR="/home/rkeene/root/cross-compilers/${CROSS}/${CROSS}/lib/pkgconfig";
export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR

# When cross-compiling Tcl it cannot detect these things and so assumes failure
# This in turn creates linking issues because it will define the replacements
# in the main library and stubs library, which we may both link to
ac_cv_func_memcmp_working=yes
tcl_cv_strstr_unbroken=ok
tcl_cv_strtoul_unbroken=ok
tcl_cv_strtod_unbroken=ok

Modified build/make-kit-win32 from [b64eb2dc53] to [d88d986a49].

6
7
8
9
10
11
12





13
RANLIB=i586-mingw32msvc-ranlib
RC=i586-mingw32msvc-windres
STRIP="${STRIP:-i586-mingw32msvc-strip}"
TEA_PLATFORM='windows'
KC_TLS_LINKADD='-lws2_32 -lgdi32'
export AR CC CXX RANLIB RC STRIP TEA_PLATFORM KC_TLS_LINKADD






./kitcreator "$@" --host=i586-mingw32msvc







>
>
>
>
>

6
7
8
9
10
11
12
13
14
15
16
17
18
RANLIB=i586-mingw32msvc-ranlib
RC=i586-mingw32msvc-windres
STRIP="${STRIP:-i586-mingw32msvc-strip}"
TEA_PLATFORM='windows'
KC_TLS_LINKADD='-lws2_32 -lgdi32'
export AR CC CXX RANLIB RC STRIP TEA_PLATFORM KC_TLS_LINKADD

PKG_CONFIG_PATH='/dev/null/null'
PKG_CONFIG_DIR='/dev/null/null';
PKG_CONFIG_LIBDIR='/home/rkeene/root/cross-compilers/i586-mingw32msvc/i586-mingw32msvc/lib/pkgconfig';
export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR

./kitcreator "$@" --host=i586-mingw32msvc

Modified build/make-kit-win64 from [35050fb318] to [9dc31edfe8].

4
5
6
7
8
9
10





11
CC=x86_64-w64-mingw32-gcc
CXX=x86_64-w64-mingw32-g++
RANLIB=x86_64-w64-mingw32-ranlib
RC=x86_64-w64-mingw32-windres
STRIP="${STRIP:-x86_64-w64-mingw32-strip}"
export AR CC CXX RANLIB RC STRIP






./kitcreator "$@" --host=x86_64-w64-mingw32







>
>
>
>
>

4
5
6
7
8
9
10
11
12
13
14
15
16
CC=x86_64-w64-mingw32-gcc
CXX=x86_64-w64-mingw32-g++
RANLIB=x86_64-w64-mingw32-ranlib
RC=x86_64-w64-mingw32-windres
STRIP="${STRIP:-x86_64-w64-mingw32-strip}"
export AR CC CXX RANLIB RC STRIP

PKG_CONFIG_PATH='/dev/null/null'
PKG_CONFIG_DIR='/dev/null/null';
PKG_CONFIG_LIBDIR='/home/rkeene/root/cross-compilers/x86_64-w64-mingw32/x86_64-w64-mingw32/lib/pkgconfig';
export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR

./kitcreator "$@" --host=x86_64-w64-mingw32