Overview
| Comment: | Updated to statically link to libz if possible |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 13e238516922464ee4f6a644cd925503e1ec4abd |
| User & Date: | rkeene on 2010-10-02 09:30:45 |
| Other Links: | manifest | tags |
Context
|
2010-10-03
| ||
| 19:09 | Updated KitDLL to load the vfslib, to make vfs::zip work check-in: 64818401f4 user: rkeene tags: trunk | |
|
2010-10-02
| ||
| 09:30 | Updated to statically link to libz if possible check-in: 13e2385169 user: rkeene tags: trunk | |
| 09:11 | Updated to compile zlib as PIC when building KitDLL check-in: 9bd201f713 user: rkeene tags: trunk | |
Changes
Modified kitdll/build.sh from [d2bc6d6a65] to [af3cd7d998].
80 80 81 81 ## Figure out if zlib compiled (if not, the system zlib will be used and we 82 82 ## will need to have that present) 83 83 ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)" 84 84 export ZLIBDIR 85 85 if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then 86 86 EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a" 87 + 88 + LDFLAGS="${LDFLAGS} -L${ZLIBDIR}/lib" 89 + export LDFLAGS 87 90 fi 88 91 89 92 ## Tk Resources (needed for Win32 support) 90 93 TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)" 91 94 TKRSRC="${TKDIR}/lib/tkbase.res.o" 92 95 if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then 93 96 EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [7d095794dd] to [7935e5debe].
246 246 247 247 for proj in tcl tclvfs tk; do 248 248 AC_MSG_CHECKING([for libraries required for ${proj}]) 249 249 250 250 libdir="../../../${proj}/inst" 251 251 libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" 252 252 libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" 253 + 254 + for libfile in ${libfiles}; do 255 + LDFLAGS="${LDFLAGS} -L`dirname "${libfile}"`" 256 + done 253 257 254 258 if test "$proj" = "tcl"; then 255 259 DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfilesnostub], [ 256 260 libfiles="${libfilesnostub}" 257 261 ], [ 258 262 DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfiles], [ 259 263 libfiles="${libfiles}"