diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-14 12:49:18 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-18 23:47:43 +0000 |
commit | ed9971d58dce21e6ac41ae6e93a12fe4baa79430 (patch) | |
tree | 161ab13f3d51a07d3eaba72f03b01eb256762628 /meta/recipes-core/zlib/zlib_1.2.11.bb | |
parent | 2c4996548535a92da22bf4c6a9ce80139e3417f9 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core/zlib/zlib_1.2.11.bb')
-rw-r--r-- | meta/recipes-core/zlib/zlib_1.2.11.bb | 3 |
1 files changed, 1 insertions, 2 deletions
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" | |||
7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" | 7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" |
8 | 8 | ||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ | 9 | SRC_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" | |||
24 | inherit ptest | 23 | inherit ptest |
25 | 24 | ||
26 | do_configure() { | 25 | do_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 | ||
30 | do_compile() { | 29 | do_compile() { |