diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-08-05 17:52:35 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 13:27:30 +0000 |
commit | dbf6599fbe01e132455f0785bf399a14329b51c5 (patch) | |
tree | b28f41548f814a05cd20f6051cb0db9282698b4a /meta | |
parent | 442518efac00c6ecb4d914f5230c47137ac89ee5 (diff) | |
download | poky-dbf6599fbe01e132455f0785bf399a14329b51c5.tar.gz |
libiconv_1.11.1: merge build and packaging fixes from libiconv_1.14
054151c libiconv: Fix B != S with uclibc builds
273c437 libiconv: Remove RPATH from binaries
fcb8d6f libiconv_1.14.bb: Fix build failure [partial-merge]
(From OE-Core rev: 3f5b2da748bbb0417a63c69393cdd024623074a2)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core master rev: 898e9d7)
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.11.1.bb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index abf739bfa1..641aae51c2 100644 --- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb | |||
@@ -30,5 +30,16 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" | |||
30 | LEAD_SONAME = "libiconv.so" | 30 | LEAD_SONAME = "libiconv.so" |
31 | 31 | ||
32 | do_configure_prepend () { | 32 | do_configure_prepend () { |
33 | rm -f m4/libtool.m4 libcharset/m4/libtool.m4 | 33 | rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 |
34 | } | ||
35 | |||
36 | do_configure_append () { | ||
37 | # forcibly remove RPATH from libtool | ||
38 | sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool | ||
39 | sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool | ||
40 | } | ||
41 | |||
42 | do_install_append () { | ||
43 | rm -rf ${D}${libdir}/preloadable_libiconv.so | ||
44 | rm -rf ${D}${libdir}/charset.alias | ||
34 | } | 45 | } |