diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-08-05 17:52:35 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-10 12:40:27 -0700 |
commit | 670244e447d7527e9698dae5306332ea925a4a42 (patch) | |
tree | 501f85233c2a9961d06a2e78976b64482b224354 /meta/recipes-support/libiconv | |
parent | 2601d52075bc83139ff256f2ea3f5491eb19b5f1 (diff) | |
download | openembedded-core-contrib-670244e447d7527e9698dae5306332ea925a4a42.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: 898e9d7c6da2ddc60597edc2ee7b939fa38d410e)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libiconv')
-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 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 } |