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 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     15   CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
    16     16   RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
    17     17   if [ -z "${STRIP}" ]; then
    18     18   	STRIP="${CCROOTBIN}/${CROSS}-strip"
    19     19   fi
    20     20   export PATH AR CC CXX RANLIB STRIP
    21     21   
           22  +PKG_CONFIG_PATH='/dev/null/null'
           23  +PKG_CONFIG_DIR='/dev/null/null';
           24  +PKG_CONFIG_LIBDIR="/home/rkeene/root/cross-compilers/${CROSS}/${CROSS}/lib/pkgconfig";
           25  +export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR
           26  +
    22     27   # When cross-compiling Tcl it cannot detect these things and so assumes failure
    23     28   # This in turn creates linking issues because it will define the replacements
    24     29   # in the main library and stubs library, which we may both link to
    25     30   ac_cv_func_memcmp_working=yes
    26     31   tcl_cv_strstr_unbroken=ok
    27     32   tcl_cv_strtoul_unbroken=ok
    28     33   tcl_cv_strtod_unbroken=ok

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

     6      6   RANLIB=i586-mingw32msvc-ranlib
     7      7   RC=i586-mingw32msvc-windres
     8      8   STRIP="${STRIP:-i586-mingw32msvc-strip}"
     9      9   TEA_PLATFORM='windows'
    10     10   KC_TLS_LINKADD='-lws2_32 -lgdi32'
    11     11   export AR CC CXX RANLIB RC STRIP TEA_PLATFORM KC_TLS_LINKADD
    12     12   
           13  +PKG_CONFIG_PATH='/dev/null/null'
           14  +PKG_CONFIG_DIR='/dev/null/null';
           15  +PKG_CONFIG_LIBDIR='/home/rkeene/root/cross-compilers/i586-mingw32msvc/i586-mingw32msvc/lib/pkgconfig';
           16  +export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR
           17  +
    13     18   ./kitcreator "$@" --host=i586-mingw32msvc

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

     4      4   CC=x86_64-w64-mingw32-gcc
     5      5   CXX=x86_64-w64-mingw32-g++
     6      6   RANLIB=x86_64-w64-mingw32-ranlib
     7      7   RC=x86_64-w64-mingw32-windres
     8      8   STRIP="${STRIP:-x86_64-w64-mingw32-strip}"
     9      9   export AR CC CXX RANLIB RC STRIP
    10     10   
           11  +PKG_CONFIG_PATH='/dev/null/null'
           12  +PKG_CONFIG_DIR='/dev/null/null';
           13  +PKG_CONFIG_LIBDIR='/home/rkeene/root/cross-compilers/x86_64-w64-mingw32/x86_64-w64-mingw32/lib/pkgconfig';
           14  +export PKG_CONFIG_PATH PKG_CONFIG_DIR PKG_CONFIG_LIBDIR
           15  +
    11     16   ./kitcreator "$@" --host=x86_64-w64-mingw32