diff options
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch')
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch new file mode 100644 index 0000000000..cc26749c48 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | In the target case, we can't check if perl exists or try running it. If we | ||
| 2 | don't patch the code, the native perl location would be used, not the target | ||
| 3 | which is also incorrect. We therefore disable this code and rely on the | ||
| 4 | correct value of PERL being passed in. | ||
| 5 | |||
| 6 | RP 31/8/2011 | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [OE specific] | ||
| 9 | |||
| 10 | Index: intltool-0.40.6/configure.ac | ||
| 11 | =================================================================== | ||
| 12 | --- intltool-0.40.6.orig/configure.ac 2011-08-31 11:21:13.061160535 +0100 | ||
| 13 | +++ intltool-0.40.6/configure.ac 2011-08-31 11:22:44.991160885 +0100 | ||
| 14 | @@ -11,24 +11,10 @@ | ||
| 15 | aclocaldir='${datadir}'/aclocal | ||
| 16 | AC_SUBST(aclocaldir) | ||
| 17 | |||
| 18 | -AC_PATH_PROG(PERL, perl) | ||
| 19 | if test -z "$PERL"; then | ||
| 20 | - AC_MSG_ERROR([perl not found]) | ||
| 21 | -fi | ||
| 22 | -AC_MSG_CHECKING([for perl >= 5.8.1]) | ||
| 23 | -$PERL -e "use 5.8.1;" > /dev/null 2>&1 | ||
| 24 | -if test $? -ne 0; then | ||
| 25 | - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) | ||
| 26 | -else | ||
| 27 | - PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`" | ||
| 28 | - AC_MSG_RESULT([$PERL_VERSION]) | ||
| 29 | -fi | ||
| 30 | -AC_MSG_CHECKING([for XML::Parser]) | ||
| 31 | -if `$PERL -e "require XML::Parser" 2>/dev/null`; then | ||
| 32 | - AC_MSG_RESULT([ok]) | ||
| 33 | -else | ||
| 34 | - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
| 35 | + AC_MSG_ERROR([PERL variable not set]) | ||
| 36 | fi | ||
| 37 | +AC_SUBST(PERL) | ||
| 38 | |||
| 39 | AC_OUTPUT([ | ||
| 40 | Makefile | ||
