summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-14 12:49:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 23:47:43 +0000
commited9971d58dce21e6ac41ae6e93a12fe4baa79430 (patch)
tree161ab13f3d51a07d3eaba72f03b01eb256762628
parent2c4996548535a92da22bf4c6a9ce80139e3417f9 (diff)
downloadpoky-ed9971d58dce21e6ac41ae6e93a12fe4baa79430.tar.gz
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. (From OE-Core rev: 344090a549284d0a1af065ff4cc3038bff8ecfea) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch21
-rw-r--r--meta/recipes-core/zlib/zlib/Makefile-runtests.patch (renamed from meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch)0
-rw-r--r--meta/recipes-core/zlib/zlib/ldflags-tests.patch (renamed from meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch)4
-rw-r--r--meta/recipes-core/zlib/zlib/run-ptest (renamed from meta/recipes-core/zlib/zlib-1.2.11/run-ptest)0
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.11.bb3
5 files changed, 3 insertions, 25 deletions
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 @@
1
2When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
3(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
4touch */libstdc++.so && /sbin/ldconfig to fix it.
5
6So remove ldconfig call from make install-libs
7
8Upstream-Status: Inappropriate [disable feature]
9
10Index: zlib-1.2.11/Makefile.in
11===================================================================
12--- zlib-1.2.11.orig/Makefile.in
13+++ zlib-1.2.11/Makefile.in
14@@ -322,7 +322,6 @@ install-libs: $(LIBS)
15 rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
16 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
17 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
18- ($(LDCONFIG) || true) >/dev/null 2>&1; \
19 fi
20 rm -f $(DESTDIR)$(man3dir)/zlib.3
21 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
index 61eea8238a..61eea8238a 100644
--- a/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
+++ b/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
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 @@
1Obey LDFLAGS for tests 1Obey LDFLAGS for tests
2 2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com> 3Upstream-Status: Submitted [https://github.com/madler/zlib/pull/409]
4Upstream-Status: Pending 4Signed-off-by: Ross Burton <ross.burton@intel.com>
5 5
6--- zlib-1.2.8.orig/Makefile.in 6--- zlib-1.2.8.orig/Makefile.in
7+++ zlib-1.2.8/Makefile.in 7+++ 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
index 884d9dc699..884d9dc699 100644
--- a/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
+++ b/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"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
10 file://remove.ldconfig.call.patch \
11 file://Makefile-runtests.patch \ 10 file://Makefile-runtests.patch \
12 file://ldflags-tests.patch \ 11 file://ldflags-tests.patch \
13 file://run-ptest \ 12 file://run-ptest \
@@ -24,7 +23,7 @@ RDEPENDS_${PN}-ptest += "make"
24inherit ptest 23inherit ptest
25 24
26do_configure() { 25do_configure() {
27 uname=GNU ./configure --prefix=${prefix} --shared --libdir=${libdir} 26 LDCONFIG=true ./configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU
28} 27}
29 28
30do_compile() { 29do_compile() {