Overview
| Comment: | Fixed issue with zlib checking
Added support for checking for "tkbase.res.o" (present on Win32 builds) and adding to EXTRA_OBJS to link to the "kit" application |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | fd276919ad1ef982ab7d70af088cbd86e41cf43d |
| User & Date: | rkeene on 2010-09-26 04:43:24 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:43 | Changed configuration encoding to use UTF-8 to work around bug where tcl::pkgconfig doesn't work because it's populated with the specified encoding, which may be a file on disk and not available. check-in: ec2b0ff806 user: rkeene tags: trunk | |
| 04:43 |
Fixed issue with zlib checking
Added support for checking for "tkbase.res.o" (present on Win32 builds) and adding to EXTRA_OBJS to link to the "kit" application check-in: fd276919ad user: rkeene tags: trunk | |
| 04:43 | Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable check-in: fc9a2d4694 user: rkeene tags: trunk | |
Changes
Modified kitsh/build.sh from [2d66362eb1] to [6be18087ad].
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
cp -r 'buildsrc' 'build'
cd "${BUILDDIR}" || exit 1
# Cleanup, just incase the incoming directory was not pre-cleaned
${MAKE:-make} distclean >/dev/null 2>/dev/null
# Figure out if zlib compiled
ZLIBDIR=$(cd "${OTHERPKGSDIR}/zlib/inst"; pwd)
export ZLIBDIR
if [ ! -f "${ZLIBDIR}/lib/libz.a" ]; then
unset ZLIBDIR
fi
# Compile Kitsh
if [ -z "${ZLIBDIR}" ]; then
echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
else
|
| | > > > > > > > > > > > > > > |
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
cp -r 'buildsrc' 'build'
cd "${BUILDDIR}" || exit 1
# Cleanup, just incase the incoming directory was not pre-cleaned
${MAKE:-make} distclean >/dev/null 2>/dev/null
# Figure out if zlib compiled
ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
export ZLIBDIR
if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
unset ZLIBDIR
fi
# Include extra objects as required
## Initialize list of extra objects
EXTRA_OBJS=""
## 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}"
fi
## Export to the environment, to be picked up by the "configure" script
export EXTRA_OBJS
# Compile Kitsh
if [ -z "${ZLIBDIR}" ]; then
echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
else
|