From dbf6599fbe01e132455f0785bf399a14329b51c5 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 5 Aug 2015 17:52:35 -0700 Subject: 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 Signed-off-by: Richard Purdie (From OE-Core master rev: 898e9d7) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 } -- cgit v1.2.3-54-g00ecf