Overview
| Comment: | More progress on getting new version of zlib working. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | winFixes |
| Files: | files | file ages | folders |
| SHA1: |
07ceeb48332482958161fd20aa436131 |
| User & Date: | mistachkin on 2013-11-05 10:15:25 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-08-28
| ||
| 18:27 | Merge updates from trunk. check-in: df02b7cfd1 user: mistachkin tags: winFixes | |
|
2013-11-05
| ||
| 10:15 | More progress on getting new version of zlib working. check-in: 07ceeb4833 user: mistachkin tags: winFixes | |
| 08:09 | Update versions of the thread and zlib packages. check-in: 0f67789517 user: mistachkin tags: winFixes | |
Changes
Modified zlib/build.sh from [68f05d7b91] to [eadceaed0f].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 |
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"
| > > | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
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"
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}"
LIBS="${KC_ZLIB_LIBS}"
export LDFLAGS CFLAGS CPPFLAGS LIBS
|
| ︙ | ︙ | |||
45 46 47 48 49 50 51 |
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
else
cp -rp ../buildsrc/* './'
fi
cd "${BUILDDIR}" || exit 1
| | > > > > > | > > > | > > > > > > > > > > > | | | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 |
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
else
cp -rp ../buildsrc/* './'
fi
cd "${BUILDDIR}" || exit 1
# 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
fi
# 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}"
${MAKE:-make} || exit 1
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 version [2e0d9c8d12].
> > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 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' ;;
|