summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 21:12:06 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 21:12:06 +0000
commite4ac36029267c7891d1185bbb6dbe96d8636fa6b (patch)
tree83195afb909e8273405d600772d7053f472263a8
parentce846ca9cbec2f810450300042804edbf3e86d18 (diff)
downloadpoky-e4ac36029267c7891d1185bbb6dbe96d8636fa6b.tar.gz
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
-rw-r--r--meta/packages/zlib/files/autotools.patch6
-rw-r--r--meta/packages/zlib/zlib_1.2.3.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch
index d70c2f6892..c2db0848f2 100644
--- 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
583+CPPFLAGS=$zlib_save_CPPFLAGS 583+CPPFLAGS=$zlib_save_CPPFLAGS
584+ 584+
585+AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [ 585+AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [
586+ zlib_cv_use_lfs64=yes 586+ zlib_cv_use_lfs64=no
587+ if test "$ac_cv_off64_t" = "yes"; then 587+ if test "$ac_cv_type_off64_t" = "yes"; then
588+ zlib_cv_use_lfs64=yes 588+ zlib_cv_use_lfs64=yes
589+ fi 589+ fi
590+]) 590+])
591+ 591+
592+if test "$zlib_cv_use_lfs64" = "yes"; then 592+if test "$zlib_cv_use_lfs64" = "yes"; then
593+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" 593+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
594+ echo "eek" 594+
595+ #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE]) 595+ #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
596+fi 596+fi
597+ 597+
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index eeb6f3f5bb..25677733f8 100644
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
3PRIORITY = "required" 3PRIORITY = "required"
4HOMEPAGE = "http://www.gzip.org/zlib/" 4HOMEPAGE = "http://www.gzip.org/zlib/"
5LICENSE = "zlib" 5LICENSE = "zlib"
6PR = "r4" 6PR = "r6"
7 7
8SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ 8SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
9 file://1.2.3.3.dfsg.patch.gz;patch=1 \ 9 file://1.2.3.3.dfsg.patch.gz;patch=1 \