From 9535dc7c6dc185defac2cad6a2733621c42420b7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 14 Mar 2019 12:49:18 +0000 Subject: [PATCH] zlib: cleanup Drop remove.ldconfig.call.patch, as it's easier to just set LDCONFIG=true. Pass uname=GNU via the documented configure option instead of undocumented environment variable. Rename zlib-1.2.11/ to just zlib/ as we don't ship multiple versions. Send ldflags-tests.patch upstream and update Upstream-Status. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../zlib-1.2.11/remove.ldconfig.call.patch | 21 ------------------- .../Makefile-runtests.patch | 0 .../{zlib-1.2.11 => zlib}/ldflags-tests.patch | 4 ++-- .../zlib/{zlib-1.2.11 => zlib}/run-ptest | 0 meta/recipes-core/zlib/zlib_1.2.11.bb | 3 +-- 5 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch rename meta/recipes-core/zlib/{zlib-1.2.11 => zlib}/Makefile-runtests.patch (100%) rename meta/recipes-core/zlib/{zlib-1.2.11 => zlib}/ldflags-tests.patch (91%) rename meta/recipes-core/zlib/{zlib-1.2.11 => zlib}/run-ptest (100%) diff --git a/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch deleted file mode 100644 index 7ccbe1f44c..0000000000 --- a/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch +++ /dev/null @@ -1,21 +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] - -Index: zlib-1.2.11/Makefile.in -=================================================================== ---- zlib-1.2.11.orig/Makefile.in -+++ zlib-1.2.11/Makefile.in -@@ -322,7 +322,6 @@ install-libs: $(LIBS) - 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 - rm -f $(DESTDIR)$(man3dir)/zlib.3 - cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir) diff --git a/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib/Makefile-runtests.patch similarity index 100% rename from meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch rename to meta/recipes-core/zlib/zlib/Makefile-runtests.patch diff --git a/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch b/meta/recipes-core/zlib/zlib/ldflags-tests.patch similarity index 91% rename from meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch rename to meta/recipes-core/zlib/zlib/ldflags-tests.patch index 19c40b7452..286390665f 100644 --- a/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch +++ b/meta/recipes-core/zlib/zlib/ldflags-tests.patch @@ -1,7 +1,7 @@ Obey LDFLAGS for tests -Signed-off-by: Christopher Larson -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/409] +Signed-off-by: Ross Burton --- zlib-1.2.8.orig/Makefile.in +++ zlib-1.2.8/Makefile.in diff --git a/meta/recipes-core/zlib/zlib-1.2.11/run-ptest b/meta/recipes-core/zlib/zlib/run-ptest similarity index 100% rename from meta/recipes-core/zlib/zlib-1.2.11/run-ptest rename to meta/recipes-core/zlib/zlib/run-ptest diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index 6410519882..41ec29d95e 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -7,7 +7,6 @@ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ - file://remove.ldconfig.call.patch \ file://Makefile-runtests.patch \ file://ldflags-tests.patch \ file://run-ptest \ @@ -24,7 +23,7 @@ RDEPENDS_${PN}-ptest += "make" inherit ptest do_configure() { - uname=GNU ./configure --prefix=${prefix} --shared --libdir=${libdir} + LDCONFIG=true ./configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU } do_compile() { -- 2.40.1