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>
This commit is contained in:
parent
77912d65c7
commit
df2da07184
|
@ -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)
|
|
@ -1,13 +1,18 @@
|
||||||
require intltool.inc
|
require intltool.inc
|
||||||
LICENSE="GPLv2"
|
LICENSE="GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
||||||
SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
|
SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
|
||||||
${NATIVEPATCHES} \
|
${NATIVEPATCHES} \
|
||||||
"
|
"
|
||||||
|
|
||||||
NATIVEPATCHES = "file://noperlcheck.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"
|
NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
|
SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
|
||||||
|
|
Loading…
Reference in New Issue