diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-29 21:12:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-29 21:12:06 +0000 |
| commit | e4ac36029267c7891d1185bbb6dbe96d8636fa6b (patch) | |
| tree | 83195afb909e8273405d600772d7053f472263a8 /meta | |
| parent | ce846ca9cbec2f810450300042804edbf3e86d18 (diff) | |
| download | openembedded-core-e4ac36029267c7891d1185bbb6dbe96d8636fa6b.tar.gz openembedded-core-e4ac36029267c7891d1185bbb6dbe96d8636fa6b.tar.bz2 openembedded-core-e4ac36029267c7891d1185bbb6dbe96d8636fa6b.tar.xz openembedded-core-e4ac36029267c7891d1185bbb6dbe96d8636fa6b.zip | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/zlib/files/autotools.patch | 6 | ||||
| -rw-r--r-- | meta/packages/zlib/zlib_1.2.3.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch index d70c2f689..c2db0848f 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 +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 eeb6f3f5b..25677733f 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" 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 \ |