Overview
Comment: | Updated to configure KitDLL correctly if asked to build |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 9cf7d99fe382980cf0b422f321f3d53921bbabb8 |
User & Date: | rkeene on 2010-09-30 16:47:55 |
Other Links: | manifest | tags |
Context
2010-09-30
| ||
17:35 | Fixed issue with reading binary files from KitDLL VFS check-in: 69535ebd14 user: rkeene tags: trunk | |
16:47 | Updated to configure KitDLL correctly if asked to build check-in: 9cf7d99fe3 user: rkeene tags: trunk | |
16:20 | Updated to cleanup wish if built check-in: dc8f5f22bf user: rkeene tags: trunk | |
Changes
Modified kitcreator from [d5b8c5cc2c] to [4831102fe2].
47 47 48 48 CONFIGUREEXTRA="$@" 49 49 export CONFIGUREEXTRA 50 50 51 51 if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then 52 52 KITCREATOR_PKGS="${KITCREATOR_PKGS} thread" 53 53 fi 54 + 55 +# Fix up package list 56 +## If building KitDLL, it must come last 57 +if echo " ${KITCREATOR_PKGS} " | grep ' kitdll ' >/dev/null 2>/dev/null; then 58 + KITCREATOR_PKGS="$(echo " ${KITCREATOR_PKGS} " | sed 's@ kitdll @ @g;s@^ *@@;s@ *$@@;s@ *@ @g') kitdll" 59 +fi 60 + 61 +## If building KitDLL and Tk, must do Tk statically 62 +### (Well, we don't HAVE to, but it would defeat much of the purpose) 63 +if echo " ${KITCREATOR_PKGS} " | grep ' kitdll ' >/dev/null 2>/dev/null; then 64 + if echo " ${KITCREATOR_PKGS} " | grep ' tk ' >/dev/null 2>/dev/null; then 65 + if [ "${STATICTK}" != "1" -a "${STATICTK}" != "-1" ]; then 66 + echo 'Warning: Linking Tk statically because you are building KitDLL' 2>&1 67 + echo ' Set STATICTK to -1 if you really want to link Tk dynamically.' >&2 68 + 69 + STATICTK="1" 70 + export STATICTK 71 + fi 72 + fi 73 +fi 54 74 55 75 failedpkgs="" 56 76 buildfailed="0" 57 77 for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do 58 78 echo -n "Building ${pkg} ..." 59 79 60 80 failed="0"