aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-08-05 17:52:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-09 15:14:31 -0700
commit898e9d7c6da2ddc60597edc2ee7b939fa38d410e (patch)
tree5087fe032268f6f5909a56263a71be83f7ff410e
parent7d2da0ef71c2ab950a67a50f5952858b33b628bc (diff)
downloadopenembedded-core-contrib-898e9d7c6da2ddc60597edc2ee7b939fa38d410e.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>
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.11.1.bb13
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 d09b194498..6ce4b96e33 100644
--- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
@@ -32,5 +32,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
}