summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Daubert <jue@jue.li>2010-09-14 20:50:35 +0200
committerJuergen Daubert <jue@jue.li>2010-09-14 20:50:35 +0200
commitb091d9470f897dc84bced302efed074d53b4b2c0 (patch)
treef273483f12ca20488a8718c564fae71c562b0181
parentbad573400c1b75749185e8c57f551df772295b63 (diff)
downloadpkgutils-b091d9470f897dc84bced302efed074d53b4b2c0.tar.gz
pkgutils-b091d9470f897dc84bced302efed074d53b4b2c0.tar.xz
zlib: fix for FS#588
-rw-r--r--zlib/.md5sum1
-rw-r--r--zlib/Pkgfile6
-rw-r--r--zlib/zlib-1.2.5-lfs-decls.patch15
3 files changed, 20 insertions, 2 deletions
diff --git a/zlib/.md5sum b/zlib/.md5sum
index a8e91ef2..5a73a3dd 100644
--- a/zlib/.md5sum
+++ b/zlib/.md5sum
@@ -1 +1,2 @@
+e0b1ddb828dbe6eda55abb992967463c zlib-1.2.5-lfs-decls.patch
be1e89810e66150f5b0327984d8625a0 zlib-1.2.5.tar.bz2
diff --git a/zlib/Pkgfile b/zlib/Pkgfile
index 132bae9e..d2625485 100644
--- a/zlib/Pkgfile
+++ b/zlib/Pkgfile
@@ -4,11 +4,13 @@
name=zlib
version=1.2.5
-release=1
-source=(http://www.zlib.net/$name-$version.tar.bz2)
+release=2
+source=(http://www.zlib.net/$name-$version.tar.bz2 \
+ $name-$version-lfs-decls.patch)
build() {
cd $name-$version
+ patch -p1 -i $SRC/$name-$version-lfs-decls.patch
./configure --prefix=/usr
make
make DESTDIR=$PKG mandir=/usr/man install
diff --git a/zlib/zlib-1.2.5-lfs-decls.patch b/zlib/zlib-1.2.5-lfs-decls.patch
new file mode 100644
index 00000000..8d734308
--- /dev/null
+++ b/zlib/zlib-1.2.5-lfs-decls.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/316377
+
+try to unbreak over-eager LFS logic in zlib header
+
+--- zlib-1.2.5/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1578,7 +1578,7 @@
+ # define gzoffset gzoffset64
+ # define adler32_combine adler32_combine64
+ # define crc32_combine crc32_combine64
+-# ifdef _LARGEFILE64_SOURCE
++# ifndef _LARGEFILE64_SOURCE
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));

Generated by cgit