diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2015-08-05 17:52:35 -0700 |
|---|---|---|
| committer |   Joshua Lock <joshua.lock@collabora.co.uk> | 2015-11-05 22:04:15 +0000 |
| commit | 3f5b2da748bbb0417a63c69393cdd024623074a2 (patch) | |
| tree | 4456d06b3069d2b8d509d26542a7bd3dffbfd2a4 /meta/recipes-support | |
| parent | 6077f09f76b05b002f21e14c62c7c986db5427a9 (diff) | |
| download | openembedded-core-3f5b2da748bbb0417a63c69393cdd024623074a2.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]
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>
Diffstat (limited to 'meta/recipes-support')
| -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" LEAD_SONAME = "libiconv.so" do_configure_prepend () { - rm -f m4/libtool.m4 libcharset/m4/libtool.m4 + 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 +} + +do_configure_append () { + # forcibly remove RPATH from libtool + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool +} + +do_install_append () { + rm -rf ${D}${libdir}/preloadable_libiconv.so + rm -rf ${D}${libdir}/charset.alias } |