summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/zlib
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-09-30 15:43:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 09:00:09 (GMT)
commitd760fcc56536c7ecd1ec94548bb0dae09b2cf934 (patch)
tree187197f2dede1a54f55447ff5d7170e2cdee3851 /meta/recipes-core/zlib
parentd90119a25e5b8216467a11c356f0e09844b31511 (diff)
downloadpoky-d760fcc56536c7ecd1ec94548bb0dae09b2cf934.tar.gz
zlib: fix inverted LFS logic
(From OE-Core rev: 6dd3f5c2f300c9cb5b6dbe2afe67323fc6f44c3e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/zlib')
-rw-r--r--meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch20
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.5.bb5
2 files changed, 23 insertions, 2 deletions
diff --git a/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch b/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
new file mode 100644
index 0000000..038c1a2
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Pending
2
3see
4https://bugs.gentoo.org/316377?id=316377
5https://bugs.freedesktop.org/show_bug.cgi?id=33710
6http://lists.freedesktop.org/archives/poppler-bugs/2011-January/006014.html
7for details
8
9diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
10--- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200
11+++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200
12@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
13 # define gzoffset gzoffset64
14 # define adler32_combine adler32_combine64
15 # define crc32_combine crc32_combine64
16-# ifdef _LARGEFILE64_SOURCE
17+# ifndef _LARGEFILE64_SOURCE
18 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
19 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
20 ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
index 96dab25..bca400c 100644
--- a/meta/recipes-core/zlib/zlib_1.2.5.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
@@ -7,11 +7,12 @@ LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
8 8
9DEPENDS = "libtool-cross" 9DEPENDS = "libtool-cross"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
13 file://configure.ac \ 13 file://configure.ac \
14 file://Makefile.am" 14 file://Makefile.am \
15 file://fix.inverted.LFS.logic.patch"
15 16
16SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0" 17SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
17SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307" 18SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"