zlib: Fix autotools off64_t patch logic fixing darwin builds

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5328 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch
index d70c2f689231182258f8ac696b1ee5adfbc1ee24..c2db0848f26974d6b2f1c9d1dd0b230d01636ba3 100644 (file)
--- a/meta/packages/zlib/files/autotools.patch
+++ b/meta/packages/zlib/files/autotools.patch
@@ -583,15 +583,15 @@ Index: zlib-1.2.3/configure.ac
 +CPPFLAGS=$zlib_save_CPPFLAGS
 +
 +AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [
-+    zlib_cv_use_lfs64=yes
-+    if test "$ac_cv_off64_t" = "yes"; then
++    zlib_cv_use_lfs64=no
++    if test "$ac_cv_type_off64_t" = "yes"; then
 +        zlib_cv_use_lfs64=yes
 +    fi
 +])
 +
 +if test "$zlib_cv_use_lfs64" = "yes"; then
 +    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
-+    echo "eek"
++    
 +    #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
 +fi    
 +

diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index eeb6f3f5bb2cb35daf030ec5d36d56062e23f415..25677733f849e308df3e70bae27c00a2c785ecdf 100644 (file)
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "required"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
                file://1.2.3.3.dfsg.patch.gz;patch=1 \