summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 11:26:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 18:06:57 +0100
commit8a78ed689daa9a0eab0ff9e0c4d1ac5fc0b520a9 (patch)
tree941a6e028c3b6ebc9375945dbea611aed624e2c4
parent9df33286b057f9257aae64d8724e6d1f39f722f2 (diff)
downloadpoky-8a78ed689daa9a0eab0ff9e0c4d1ac5fc0b520a9.tar.gz
intltool: Fix perl paths
Currently in the native case we have a path that can easily exceed the interpretor limit so use "env nativeperl" in that case. This patch also fixes up the target version's interpretor path but to do this we need to bypass the configure checks. (From OE-Core rev: b9fa8fd4f09b68cbcc12b557451a58a1f218d7f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch40
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc3
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.40.6.bb4
3 files changed, 45 insertions, 2 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch
new file mode 100644
index 0000000000..3d8b591a40
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch
@@ -0,0 +1,40 @@
1In the target case, we can't check if perl exists or try running it. If we
2don't patch the code, the native perl location would be used, not the target
3which is also incorrect. We therefore disable this code and rely on the
4correct value of PERL being passed in.
5
6RP 31/8/2011
7
8Upstream-Status: Inappropriate [OE specific]
9
10Index: intltool-0.40.6/configure.in
11===================================================================
12--- intltool-0.40.6.orig/configure.in 2011-08-31 11:21:13.061160535 +0100
13+++ intltool-0.40.6/configure.in 2011-08-31 11:22:44.991160885 +0100
14@@ -9,24 +9,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
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 7e11fc9da9..8d4bec5227 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -13,4 +13,7 @@ RRECOMMENDS_${PN}_virtclass-native = ""
13 13
14inherit autotools pkgconfig perlnative 14inherit autotools pkgconfig perlnative
15 15
16export PERL = "${bindir}/env perl"
17PERL_virtclass-native = "/usr/bin/env nativeperl"
18
16BBCLASSEXTEND = "native" 19BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index 931122dac2..e9871fc098 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,13 +1,13 @@
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 = "r4" 4PR = "r5"
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 = "" 10NATIVEPATCHES = "file://noperlcheck.patch"
11NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" 11NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
12 12
13SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" 13SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"