From f43139adceaf8039d5347dea0a116dc5923b24c1 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 17 Mar 2014 18:10:54 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/gettext/gettext_0.16.1.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'meta/recipes-core/gettext') diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb index 5d26f3efdc..5725e7fe07 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" -- cgit 1.2.3-korg