summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-11-23 15:47:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:08 +0000
commitad1f3d96cfb542de3157dca6694295519c39e0bb (patch)
treeab5e0d759beea94b5cae74fb8be2c48553c2dcb9 /meta/recipes-devtools
parentc06eecfc8480e847919125df14302a25ebd474b4 (diff)
downloadpoky-ad1f3d96cfb542de3157dca6694295519c39e0bb.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) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch29
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.40.6.bb11
2 files changed, 37 insertions, 3 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 @@
1Index: 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)
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index e9871fc098..c820f11bf4 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,14 +1,19 @@
1require intltool.inc 1require intltool.inc
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4PR = "r5" 4PR = "r6"
5 5
6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ 6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
7 ${NATIVEPATCHES} \ 7 ${NATIVEPATCHES} \
8 " 8 "
9 9
10NATIVEPATCHES = "file://noperlcheck.patch" 10#
11NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" 11# All of the intltool scripts have the correct paths to perl already
12# embedded into them and can find perl fine, so we add the remove xml-check
13# in the intltool.m4 via the remove-xml-check.patch
14NATIVEPATCHES = "file://noperlcheck.patch \
15 file://remove-xml-check.patch"
16NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
12 17
13SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" 18SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
14SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64" 19SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"