Fix for host conamination (v2)
cover Fix for host conamination (v2)
This address a problem where a intltool.m4 check will fail if the host system does not have XML::Parser installed.
v2: Update both Commit comment and recipe with more info about why this is needed based on email thread.
Sau!
The following changes since commit 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939:
getVar/setVar cleanups (2011-11-26 22:42:00 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (1):
intltool: remove XML::Parser check
.../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++ meta/recipes-devtools/intltool/intltool_0.40.6.bb | 11 +++++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
Signature · 1 line
1.7.6.4
PATCH 1/1 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:
Quoted 7 lines
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.
--- .../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++ meta/recipes-devtools/intltool/intltool_0.40.6.bb | 11 +++++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch new file +29 -0
@@ -0,0 +1,29 @@ +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)
meta/recipes-devtools/intltool/intltool_0.40.6.bb +8 -3
@@ -1,14 +1,19 @@ require intltool.inc LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r5" +PR = "r6" SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ ${NATIVEPATCHES} \ " -NATIVEPATCHES = "file://noperlcheck.patch" -NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" +# +# All of the intltool scripts have the correct paths to perl already +# embedded into them and can find perl fine, so we add the remove xml-check +# in the intltool.m4 via the remove-xml-check.patch +NATIVEPATCHES = "file://noperlcheck.patch \ + file://remove-xml-check.patch" +NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
Signature · 1 line
1.7.6.4