diff options
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool/remove-perl-check.patch')
-rw-r--r-- | meta/recipes-devtools/intltool/intltool/remove-perl-check.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch b/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch new file mode 100644 index 0000000000..bea0895748 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Remove the perl checks in intltool.m4. This can find a different perl binary to | ||
2 | the one that the intltool scripts will actually be using (as they hard-code a | ||
3 | specific binary), for example in the intltool-native case they'll be using | ||
4 | nativeperl yet this fragment can find and test the host perl. | ||
5 | |||
6 | This can result in recipes failing in do_configure as intltool.m4 finds a host | ||
7 | perl which doesn't have XML::Parser installed, despite the fact that intltool | ||
8 | will work fine as nativeperl has XML::Parser. | ||
9 | |||
10 | Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1197875) | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | |||
13 | --- a/intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700 | ||
14 | +++ b/intltool.m4 2013-07-02 11:22:32.000000000 -0700 | ||
15 | @@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio | ||
16 | AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) | ||
17 | fi | ||
18 | |||
19 | -AC_PATH_PROG(INTLTOOL_PERL, perl) | ||
20 | -if test -z "$INTLTOOL_PERL"; then | ||
21 | - AC_MSG_ERROR([perl not found]) | ||
22 | -fi | ||
23 | -AC_MSG_CHECKING([for perl >= 5.8.1]) | ||
24 | -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 | ||
25 | -if test $? -ne 0; then | ||
26 | - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) | ||
27 | -else | ||
28 | - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` | ||
29 | - AC_MSG_RESULT([$IT_PERL_VERSION]) | ||
30 | -fi | ||
31 | -if test "x$2" != "xno-xml"; then | ||
32 | - AC_MSG_CHECKING([for XML::Parser]) | ||
33 | - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
34 | - AC_MSG_RESULT([ok]) | ||
35 | - else | ||
36 | - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
37 | - fi | ||
38 | -fi | ||
39 | - | ||
40 | # Substitute ALL_LINGUAS so we can use it in po/Makefile | ||
41 | AC_SUBST(ALL_LINGUAS) | ||
42 | |||