diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool_0.40.6.bb | 11 |
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 000000000..476d0913d --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch @@ -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) diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb index e9871fc09..c820f11bf 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 @@ 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" |