Index: zlib/build.sh ================================================================== --- zlib/build.sh +++ zlib/build.sh @@ -15,11 +15,13 @@ 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" -export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR +PATCHSCRIPTDIR="$(pwd)/patchscripts" +PATCHDIR="$(pwd)/patches" +export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR # Set configure options for this sub-project LDFLAGS="${KC_ZLIB_LDFLAGS}" CFLAGS="${KC_ZLIB_CFLAGS}" CPPFLAGS="${KC_ZLIB_CPPFLAGS}" @@ -47,13 +49,32 @@ else cp -rp ../buildsrc/* './' fi cd "${BUILDDIR}" || exit 1 - # ZLIB Expects AR to contain options - AR="${AR:-ar} rcu" - export AR + + # Apply patches if needed + for patch in "${PATCHDIR}/all"/zlib-${ZLIBVERS}-*.diff "${PATCHDIR}/all"/zlib-all-*.diff "${PATCHDIR}/${ZLIBVERS}"/zlib-${ZLIBVERS}-*.diff; do + if [ ! -f "${patch}" ]; then + continue + fi + + echo "Applying: ${patch}" + ${PATCH:-patch} -p1 < "${patch}" + done + + + # Apply patch scripts if needed + for patchscript in "${PATCHSCRIPTDIR}"/*.sh; do + if [ -f "${patchscript}" ]; then + echo "Running patch script: ${patchscript}" + + ( + . "${patchscript}" + ) + fi + done # If we are building for KitDLL, compile with '-fPIC' if [ "${KITTARGET}" = "kitdll" ]; then CFLAGS="${CFLAGS} -fPIC" export CFLAGS @@ -62,16 +83,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 ADDED zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff Index: zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff ================================================================== --- zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff +++ zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff @@ -0,0 +1,14 @@ +diff -uNr zlib-1.2.8.orig/configure zlib-1.2.8/configure +--- zlib-1.2.8.orig/configure 2013-03-23 22:30:09 -0700 ++++ zlib-1.2.8/configure 2013-11-05 00:33:39 -0800 +@@ -191,10 +191,6 @@ + CYGWIN* | Cygwin* | cygwin* | OS/2*) + EXE='.exe' ;; + MINGW* | mingw*) +-# temporary bypass +- rm -f $test.[co] $test $test$shared_ext +- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log +- leave 1 + LDSHARED=${LDSHARED-"$cc -shared"} + LDSHAREDLIBC="" + EXE='.exe' ;;