diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 14:49:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 13:00:34 +0100 |
commit | d30a5c25025c1ffacc0df036c189c935c8d3d39a (patch) | |
tree | 486346e3cf7b86e3cc6df7760cdc12f7eaefb8c0 | |
parent | a2e612c7763002c2fdc5f24cd015a8fd5b12b1e0 (diff) | |
download | poky-d30a5c25025c1ffacc0df036c189c935c8d3d39a.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.
(From OE-Core rev: 054151c77dae51e2826eeac9b9ae2de3a08f0bb6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.14.bb | 2 |
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" | |||
34 | LEAD_SONAME = "libiconv.so" | 34 | LEAD_SONAME = "libiconv.so" |
35 | 35 | ||
36 | do_configure_prepend () { | 36 | do_configure_prepend () { |
37 | 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 | 37 | 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 |
38 | } | 38 | } |
39 | 39 | ||
40 | do_configure_append () { | 40 | do_configure_append () { |