summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-07-19 12:04:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:53 +0100
commita61eb1f844814daf525d1db250194ea186c35e71 (patch)
tree034fb5992cc6ff70001b0198b6838eb6bbab8eb0 /meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
parentae39c3a0f687b6e23d2726defa8287eacb6f8a79 (diff)
downloadpoky-a61eb1f844814daf525d1db250194ea186c35e71.tar.gz
intltool: remove broken XML::Parser detection
intltool.m4 has a chunk of code that runs during configure which probes for a perl binary and verifies that it has the XML::Parser module. However in builds using intltool-native the perl binary that it finds is likely to not be the one that the intltool scripts will be using as the scripts hardcode nativeperl yet the m4 fragment searches for "perl" in $PATH. If the host perl doesn't have XML::Parser the configure will fail, despite the fact that the scripts will work. Solve this by taking an old patch from the upstream bug system to simply remove the check in intltool.m4 as it's generally useless, and remove existing patches that almost but not quite solved this issue. (From OE-Core rev: 9900000d404b09a701d5368d529eb515e054e3f0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool/use-nativeperl.patch')
-rw-r--r--meta/recipes-devtools/intltool/intltool/use-nativeperl.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
deleted file mode 100644
index 5f5fed3853..0000000000
--- a/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
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