summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/zlib
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-01-30 23:04:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-10 14:38:44 (GMT)
commita142cbd47eb78b4ea63459286d97ab5e769c7bdc (patch)
treeea9296d1fccd617a7257258064aaf5b89c4f9c55 /meta/recipes-core/zlib
parent65d296a235a7d2f2689c530c91557ed6263afc01 (diff)
downloadpoky-a142cbd47eb78b4ea63459286d97ab5e769c7bdc.tar.gz
zlib: Upgrade 1.2.5 -> 1.2.6
Dont use autotools, it really not so autoconf like. the configure script gets updated with every release of zlib and we overwrite that. Instead use the upstream provided configure copyright year was changed in zlib.h which caused change in LIC_FILE_CHECKSUM fix.inverted.LFS.logic.patch is already applied upstream so drop it Drop the configure.ac and Makefile.am scripts since we do not autoreconf anymore and do not inherit autotools anymore Bump PR for depending recipes so a rebuild it ensues so that they dont depend on .la anymore and add missing dependencies discovered during incremental build (From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29) Signed-off-by: Khem Raj <raj.khem@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/files/Makefile.am9
-rw-r--r--meta/recipes-core/zlib/files/configure.ac48
-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.bb41
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.6.bb26
5 files changed, 26 insertions, 118 deletions
diff --git a/meta/recipes-core/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am
deleted file mode 100644
index b66d299..0000000
--- a/meta/recipes-core/zlib/files/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
1lib_LTLIBRARIES = libz.la
2
3libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \
4 gzwrite.c uncompr.c deflate.c trees.c zutil.c inflate.c \
5 infback.c inftrees.c inffast.c
6
7libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
8
9include_HEADERS = zconf.h zlib.h zlibdefs.h
diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac
deleted file mode 100644
index 4761b7e..0000000
--- a/meta/recipes-core/zlib/files/configure.ac
+++ /dev/null
@@ -1,48 +0,0 @@
1AC_INIT(zlib,1.2.5)
2AC_CONFIG_SRCDIR(adler32.c)
3AM_INIT_AUTOMAKE(zlibs,1.2.5)
4
5AC_PREREQ([2.59])
6
7AC_PROG_CC([gcc])
8AC_PROG_LIBTOOL
9
10AC_HEADER_STDC
11
12zlib_save_CPPFLAGS=$CPPFLAGS
13CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
14AC_CHECK_TYPES(off64_t)
15CPPFLAGS=$zlib_save_CPPFLAGS
16
17AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [
18 zlib_cv_use_lfs64=no
19 if test "$ac_cv_type_off64_t" = "yes"; then
20 zlib_cv_use_lfs64=yes
21 fi
22])
23
24if test "$zlib_cv_use_lfs64" = "yes"; then
25 CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
26
27 #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
28fi
29
30cat > zlibdefs.h << EOF
31/* zlibdefs.h -- compile-time definitions for the zlib compression library
32 * Copyright (C) 1995-2006 Jean-loup Gailly.
33 * For conditions of distribution and use, see copyright notice in zlib.h
34 */
35
36#include <sys/types.h> /* for off_t */
37#include <unistd.h> /* for SEEK_* and off_t */
38#ifdef VMS
39# include <unixio.h> /* for off_t */
40#endif
41#ifndef z_off_t
42# define z_off_t off_t
43#endif
44EOF
45
46AC_CONFIG_FILES([Makefile])
47
48AC_OUTPUT
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
deleted file mode 100644
index 038c1a2..0000000
--- a/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
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
deleted file mode 100644
index b5756d9..0000000
--- a/meta/recipes-core/zlib/zlib_1.2.5.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1SUMMARY = "Zlib Compression Library"
2DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \
3library which is used by many different programs."
4HOMEPAGE = "http://zlib.net/"
5SECTION = "libs"
6LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
8
9DEPENDS = "libtool-cross"
10PR = "r3"
11
12SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
13 file://configure.ac \
14 file://Makefile.am \
15 file://fix.inverted.LFS.logic.patch"
16
17SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
18SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
19
20inherit autotools
21
22do_configure_prepend () {
23 cp ${WORKDIR}/configure.ac ${S}/
24 cp ${WORKDIR}/Makefile.am ${S}/
25}
26
27do_install_append () {
28 sed \
29 -e 's:@prefix@:${prefix}:' \
30 -e 's:@exec_prefix@:${exec_prefix}:' \
31 -e 's:@libdir@:${libdir}:' \
32 -e 's:@sharedlibdir@:${libdir}:' \
33 -e 's:@includedir@:${includedir}:' \
34 -e 's:@VERSION@:${PV}:' \
35 zlib.pc.in > zlib.pc
36
37 install -d ${D}${libdir}/pkgconfig
38 install -m 0644 zlib.pc ${D}${libdir}/pkgconfig/
39}
40
41BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/zlib/zlib_1.2.6.bb b/meta/recipes-core/zlib/zlib_1.2.6.bb
new file mode 100644
index 0000000..a220773
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib_1.2.6.bb
@@ -0,0 +1,26 @@
1SUMMARY = "Zlib Compression Library"
2DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \
3library which is used by many different programs."
4HOMEPAGE = "http://zlib.net/"
5SECTION = "libs"
6LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
8
9SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
10 "
11SRC_URI[md5sum] = "dc2cfa0d2313ca77224b4d932b2911e9"
12SRC_URI[sha256sum] = "fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e"
13
14do_configure (){
15 ./configure --prefix=${prefix} --shared --libdir=${libdir}
16}
17
18do_compile (){
19 oe_runmake
20}
21
22do_install() {
23 oe_runmake DESTDIR=${D} install
24}
25
26BBCLASSEXTEND = "native nativesdk"