summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-08-12 08:31:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:26:19 +0100
commit171efb209d920b148b978b54acad554d3ec589ae (patch)
treea793663f20f54f967f5bc278f3c0188eede101e6 /meta
parent5b4c0b327a2b699e9ce714cc0871eca91d5363c8 (diff)
downloadpoky-171efb209d920b148b978b54acad554d3ec589ae.tar.gz
intltool: Use nativeperl binary for PERL instead of 'perl'
License is GPLv2 change it. Defining PERL for native intltool is not needed anymore (From OE-Core rev: d4b4ecb33c727ed54ab52de79e69cd3f0d14fb35) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch20
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc3
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.40.6.bb9
3 files changed, 28 insertions, 4 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch
new file mode 100644
index 0000000000..5f5fed3853
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch
@@ -0,0 +1,20 @@
1OE has perl binary as 'nativeperl' in native sysroot so we look for it
2in order to avoid intltool searching and finding perl from /usr/bin
3on build system which may not have all the modules that it needs.
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Inappropriate [OE specific]
8Index: intltool-0.40.6/intltool.m4
9===================================================================
10--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800
11+++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700
12@@ -110,7 +110,7 @@
13 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
14 fi
15
16-AC_PATH_PROG(INTLTOOL_PERL, perl)
17+AC_PATH_PROG(INTLTOOL_PERL, nativeperl)
18 if test -z "$INTLTOOL_PERL"; then
19 AC_MSG_ERROR([perl not found])
20 fi
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 1e778b6f3e..7e11fc9da9 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -1,6 +1,6 @@
1DESCRIPTION = "Utility scripts for internationalizing XML" 1DESCRIPTION = "Utility scripts for internationalizing XML"
2SECTION = "devel" 2SECTION = "devel"
3LICENSE = "GPL" 3LICENSE = "GPLv2"
4 4
5URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" 5URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
6SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" 6SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
@@ -13,5 +13,4 @@ RRECOMMENDS_${PN}_virtclass-native = ""
13 13
14inherit autotools pkgconfig perlnative 14inherit autotools pkgconfig perlnative
15 15
16export PERL_virtclass-native = "/usr/bin/env perl"
17BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index c7938e5d36..931122dac2 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,9 +1,14 @@
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 = "r3" 4PR = "r4"
5 5
6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch" 6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
7 ${NATIVEPATCHES} \
8 "
9
10NATIVEPATCHES = ""
11NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
7 12
8SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" 13SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
9SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64" 14SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"