aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>2012-10-10 17:21:08 +0000
committereschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>2012-10-10 17:21:08 +0000
commiteee265287a9fd5652bf5a6dcf96955688d583ea0 (patch)
treed5a0897f2e2b01fd5dc5727df1f3b79737cb862c
parent62ae84fe18d6171d7889645bd17ecfd246dbe408 (diff)
Update to FFTW zlib 1.2.7
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@16 d47fded2-66c1-406f-af09-4fc0800f9c6b
-rw-r--r--configure.sh4
-rw-r--r--dist/zlib-1.2.5.tar.gzbin544640 -> 0 bytes
-rw-r--r--dist/zlib-1.2.7.tar.gzbin0 -> 560351 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/configure.sh b/configure.sh
index a2d0c60..687bce6 100644
--- a/configure.sh
+++ b/configure.sh
@@ -80,7 +80,7 @@ then
# Set locations
THORN=zlib
- NAME=zlib-1.2.5
+ NAME=zlib-1.2.7
SRCDIR=$(dirname $0)
BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
if [ -z "${ZLIB_INSTALL_DIR}" ]; then
@@ -134,7 +134,7 @@ then
echo "zlib: Unpacking archive..."
pushd ${BUILD_DIR}
${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
- ${PATCH?} -p0 < ${SRCDIR}/dist/install.diff
+ #${PATCH?} -p0 < ${SRCDIR}/dist/install.diff
echo "zlib: Configuring..."
cd ${NAME}
diff --git a/dist/zlib-1.2.5.tar.gz b/dist/zlib-1.2.5.tar.gz
deleted file mode 100644
index 16a637b..0000000
--- a/dist/zlib-1.2.5.tar.gz
+++ /dev/null
Binary files differ
diff --git a/dist/zlib-1.2.7.tar.gz b/dist/zlib-1.2.7.tar.gz
new file mode 100644
index 0000000..833e888
--- /dev/null
+++ b/dist/zlib-1.2.7.tar.gz
Binary files differ