[oe-commits] Martin Jansa : zlib: fix inverted LFS logic

[git version control]

Module: openembedded-core.git
Branch: master-next
Commit: 6dd3f5c2f300c9cb5b6dbe2afe67323fc6f44c3e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6dd3f5c2f300c9cb5b6dbe2afe67323fc6f44c3e

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Sep 30 17:43:25 2011 +0200

zlib: fix inverted LFS logic

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch   |   20 ++++++++++++++++++++
 meta/recipes-core/zlib/zlib_1.2.5.bb               |    5 +++--
 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 @@
+Upstream-Status: Pending
+
+see
+https://bugs.gentoo.org/316377?id=316377
+https://bugs.freedesktop.org/show_bug.cgi?id=33710
+http://lists.freedesktop.org/archives/poppler-bugs/2011-January/006014.html
+for details
+
+diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
+--- zlib-1.2.5/zlib.h.pom	2010-04-20 06:12:48.000000000 +0200
++++ zlib-1.2.5/zlib.h	2010-06-16 13:08:59.000000000 +0200
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  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));
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"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
 
 DEPENDS = "libtool-cross"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
            file://configure.ac \
-           file://Makefile.am"
+           file://Makefile.am \
+	   file://fix.inverted.LFS.logic.patch"
 
 SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
 SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"