Files
poky/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
Saul Wold ad1f3d96cf intltool: remove XML::Parser check
Add Patch to disable the XML::Parser check in the target
intltool.m4, this check will find the host (not native)
XML::Parser if it's installed possibly causing Host
contamination, but will also fail configuration if XML::Parser
is not installed on the host.

Since we know that XML::Parser is installed on the image, we don't
really need this check, so comment it out.

From RP in mail thread:
> If the recipe needs perl for
> some other reason than intltool, it needs perlnative but it if only
> needs perl for intltool, we shouldn't need the dependency. The .m4 macro
> checks are well intended but don't fit the way we use perl. I really
> don't want to end up in a position where intltool automatically means we
> have to add perlnative as a dependency and we've previously seen many
> problems related to that.

(From OE-Core rev: 264fb6c5a4875cd8969a24a9f0301ed916ab827b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 11:22:08 +00:00

30 lines
1.0 KiB
Diff

Index: intltool-0.40.6/intltool.m4
===================================================================
--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800
+++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800
@@ -122,14 +122,16 @@
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
AC_MSG_RESULT([$IT_PERL_VERSION])
fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
+
+# Disable this check since we know XML::Parser is installed
+#if test "x$2" != "xno-xml"; then
+# AC_MSG_CHECKING([for XML::Parser])
+# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+# AC_MSG_RESULT([ok])
+# else
+# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+# fi
+#fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)