Check-in [13e2385169]
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
81
82
83
84
85
86



87
88
89
90
91
92
93
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96







+
+
+








	## Figure out if zlib compiled (if not, the system zlib will be used and we
	## will need to have that present)
	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
	export ZLIBDIR
	if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then
		EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a"

		LDFLAGS="${LDFLAGS} -L${ZLIBDIR}/lib"
		export LDFLAGS
	fi

	## Tk Resources (needed for Win32 support)
	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
	TKRSRC="${TKDIR}/lib/tkbase.res.o"
	if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"

Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [7d095794dd] to [7935e5debe].

246
247
248
249
250
251
252




253
254
255
256
257
258
259
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263







+
+
+
+








	for proj in tcl tclvfs tk; do
		AC_MSG_CHECKING([for libraries required for ${proj}])

		libdir="../../../${proj}/inst"
		libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
		libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"

		for libfile in ${libfiles}; do
			LDFLAGS="${LDFLAGS} -L`dirname "${libfile}"`"
		done

		if test "$proj" = "tcl"; then
			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfilesnostub], [
				libfiles="${libfilesnostub}"
			], [
				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfiles], [
					libfiles="${libfiles}"