Index: zlib/build.sh ================================================================== --- zlib/build.sh +++ zlib/build.sh @@ -9,11 +9,11 @@ echo 'ERROR: The TCLVERS environment variable is not set' >&2 exit 1 fi -ZLIBVERS="1.2.3" +ZLIBVERS="1.2.8" SRC="src/zlib-${ZLIBVERS}.tar.gz" SRCURL="http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERS}/zlib-${ZLIBVERS}.tar.gz/download" BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" @@ -47,13 +47,10 @@ else cp -rp ../buildsrc/* './' fi cd "${BUILDDIR}" || exit 1 - # ZLIB Expects AR to contain options - AR="${AR:-ar} rcu" - export AR # If we are building for KitDLL, compile with '-fPIC' if [ "${KITTARGET}" = "kitdll" ]; then CFLAGS="${CFLAGS} -fPIC" export CFLAGS @@ -62,16 +59,16 @@ # We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf # script and will puke echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\"" ./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" - echo "Running: ${MAKE:-make} AR=\"${AR}\"" - ${MAKE:-make} AR="${AR}" || exit 1 + echo "Running: ${MAKE:-make}" + ${MAKE:-make} || exit 1 - echo "Running: ${MAKE:-make} install AR=\"${AR}\"" - ${MAKE:-make} install AR="${AR}" + echo "Running: ${MAKE:-make} install" + ${MAKE:-make} install # We don't really care too much about failure in zlib exit 0 ) || exit 1 exit 0