[oe-commits] Christopher Larson : gettext-0.16.1: kill target m4 macros from sysroot

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 75c1d4ea8448b76bcdb18effc964de1ce323cc74
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=75c1d4ea8448b76bcdb18effc964de1ce323cc74

Author: Christopher Larson <kergoth at gmail.com>
Date:   Mon Mar 17 18:10:54 2014 +0000

gettext-0.16.1: kill target m4 macros from sysroot

Ever since the change to how aclocal files are copied (based on dependencies),
target m4 macros seem to more reliably be used in preference to native (which
they should), but in a non-gplv3 build, gettext is 0.16 while gettext-native is
0.18, causing a 0.16 po.m4 to be used with our 0.18 po/Makefile.in.in files,
causing at least some failed builds, including e2fsprogs.

Anyone inheriting gettext will have both gettext-native and gettext available,
and we don't want to use older macros from the target gettext in a non-gplv3
build, so kill them and let dependent recipes rely on gettext-native.

[YOCTO #5964]

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/gettext/gettext_0.16.1.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 5d26f3e..5725e7f 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -95,4 +95,15 @@ do_install_append() {
 	rm -f ${D}${libdir}/preloadable_libintl.so
 }
 
+# Anyone inheriting gettext will have both gettext-native and gettext
+# available, and we don't want to use older macros from the target gettext in
+# a non-gplv3 build, so kill them and let dependent recipes rely on
+# gettext-native.
+
+SYSROOT_PREPROCESS_FUNCS += "remove_sysroot_m4_macros"
+
+remove_sysroot_m4_macros () {
+    rm -r "${SYSROOT_DESTDIR}${datadir}/aclocal"
+}
+
 BBCLASSEXTEND = "native nativesdk"