diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-11-23 15:47:27 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:51 +0000 |
| commit | df2da07184ab0a4e04e1cb273bd5bae710f5b012 (patch) | |
| tree | d55f5f7e5804eeb74e3758e4d4c93dfed61a219a /meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch | |
| parent | 77912d65c738257c6d9b217571e25e5640d32c6f (diff) | |
| download | poky-df2da07184ab0a4e04e1cb273bd5bae710f5b012.tar.gz | |
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)
(From OE-Core rev: 085c76298891dc0b0e2207ef929569672c9cb254)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch')
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch new file mode 100644 index 0000000000..476d0913d4 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Index: intltool-0.40.6/intltool.m4 | ||
| 2 | =================================================================== | ||
| 3 | --- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 | ||
| 4 | +++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800 | ||
| 5 | @@ -122,14 +122,16 @@ | ||
| 6 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" | ||
| 7 | AC_MSG_RESULT([$IT_PERL_VERSION]) | ||
| 8 | fi | ||
| 9 | -if test "x$2" != "xno-xml"; then | ||
| 10 | - AC_MSG_CHECKING([for XML::Parser]) | ||
| 11 | - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
| 12 | - AC_MSG_RESULT([ok]) | ||
| 13 | - else | ||
| 14 | - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
| 15 | - fi | ||
| 16 | -fi | ||
| 17 | + | ||
| 18 | +# Disable this check since we know XML::Parser is installed | ||
| 19 | +#if test "x$2" != "xno-xml"; then | ||
| 20 | +# AC_MSG_CHECKING([for XML::Parser]) | ||
| 21 | +# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
| 22 | +# AC_MSG_RESULT([ok]) | ||
| 23 | +# else | ||
| 24 | +# AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
| 25 | +# fi | ||
| 26 | +#fi | ||
| 27 | |||
| 28 | # Substitute ALL_LINGUAS so we can use it in po/Makefile | ||
| 29 | AC_SUBST(ALL_LINGUAS) | ||