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>
This commit is contained in:
parent
2601d52075
commit
670244e447
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue