[OE-core] [PATCH] zlib: upgrade to 1.2.7
Eric Bénard
eric at eukrea.com
Tue May 8 17:19:54 UTC 2012
1.2.6 is no morre fetchable and 1.2.7 fix some bugs, full changelog is
available here : http://zlib.net/ChangeLog.txt
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
.../zlib/zlib-1.2.6/remove.ldconfig.call.patch | 20 -------------
.../zlib/zlib-1.2.7/remove.ldconfig.call.patch | 20 +++++++++++++
meta/recipes-core/zlib/zlib_1.2.6.bb | 29 --------------------
meta/recipes-core/zlib/zlib_1.2.7.bb | 29 ++++++++++++++++++++
4 files changed, 49 insertions(+), 49 deletions(-)
delete mode 100644 meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
create mode 100644 meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch
delete mode 100644 meta/recipes-core/zlib/zlib_1.2.6.bb
create mode 100644 meta/recipes-core/zlib/zlib_1.2.7.bb
diff --git a/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
deleted file mode 100644
index 403b482..0000000
--- a/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
-(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
-touch */libstdc++.so && /sbin/ldconfig to fix it.
-
-So remove ldconfig call from make install-libs
-
-Upstream-Status: Inappropriate [disable feature]
-
-diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
---- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100
-+++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100
-@@ -199,7 +199,6 @@
- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-- ($(LDCONFIG) || true) >/dev/null 2>&1; \
- fi
- cp zlib.3 $(DESTDIR)$(man3dir)
- chmod 644 $(DESTDIR)$(man3dir)/zlib.3
diff --git a/meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch
new file mode 100644
index 0000000..403b482
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch
@@ -0,0 +1,20 @@
+
+When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
+(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
+touch */libstdc++.so && /sbin/ldconfig to fix it.
+
+So remove ldconfig call from make install-libs
+
+Upstream-Status: Inappropriate [disable feature]
+
+diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
+--- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100
++++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100
+@@ -199,7 +199,6 @@
+ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+- ($(LDCONFIG) || true) >/dev/null 2>&1; \
+ fi
+ cp zlib.3 $(DESTDIR)$(man3dir)
+ chmod 644 $(DESTDIR)$(man3dir)/zlib.3
diff --git a/meta/recipes-core/zlib/zlib_1.2.6.bb b/meta/recipes-core/zlib/zlib_1.2.6.bb
deleted file mode 100644
index 54f8abf..0000000
--- a/meta/recipes-core/zlib/zlib_1.2.6.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Zlib Compression Library"
-DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \
-library which is used by many different programs."
-HOMEPAGE = "http://zlib.net/"
-SECTION = "libs"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
-
-PR = "r1"
-
-SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
- file://remove.ldconfig.call.patch \
- "
-SRC_URI[md5sum] = "dc2cfa0d2313ca77224b4d932b2911e9"
-SRC_URI[sha256sum] = "fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e"
-
-do_configure (){
- ./configure --prefix=${prefix} --shared --libdir=${libdir}
-}
-
-do_compile (){
- oe_runmake
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
new file mode 100644
index 0000000..f37856e
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Zlib Compression Library"
+DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \
+library which is used by many different programs."
+HOMEPAGE = "http://zlib.net/"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
+
+PR = "r1"
+
+SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
+ file://remove.ldconfig.call.patch \
+ "
+SRC_URI[md5sum] = "2ab442d169156f34c379c968f3f482dd"
+SRC_URI[sha256sum] = "49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934"
+
+do_configure (){
+ ./configure --prefix=${prefix} --shared --libdir=${libdir}
+}
+
+do_compile (){
+ oe_runmake
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} install
+}
+
+BBCLASSEXTEND = "native nativesdk"
--
1.7.0.4
More information about the Openembedded-core
mailing list