aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 14:49:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 12:56:42 +0100
commit054151c77dae51e2826eeac9b9ae2de3a08f0bb6 (patch)
tree9772c46239208e0ce7dc7d056c26d408da35bf64
parent8b14fcc62f31bbbb231790136cdb984db96d9ba9 (diff)
downloadopenembedded-core-contrib-054151c77dae51e2826eeac9b9ae2de3a08f0bb6.tar.gz
libiconv: Fix B != S with uclibc builds
Without this, uclibc builds fail with libtool version mismatches. The issue is that we need to remove the files in ${S}, not ${B} which is now the default after the B != S change. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.14.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb
index a670e2c62e..d5f47b4e34 100644
--- a/meta/recipes-support/libiconv/libiconv_1.14.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.14.bb
@@ -34,7 +34,7 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
LEAD_SONAME = "libiconv.so"
do_configure_prepend () {
- rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 libcharset/m4/libtool.m4 libcharset/m4/ltoptions.m4 libcharset/m4/ltsugar.m4 libcharset/m4/ltversion.m4 libcharset/m4/lt~obsolete.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 () {