diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-07-19 12:04:12 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:01 +0100 |
| commit | 9900000d404b09a701d5368d529eb515e054e3f0 (patch) | |
| tree | 7dd467260ba7bf8c866abefe7a15cfc3d3629acd /meta/recipes-devtools/intltool/intltool/use-nativeperl.patch | |
| parent | bf88f089c3bb8ceef7338436a1688a44399efc57 (diff) | |
| download | openembedded-core-contrib-9900000d404b09a701d5368d529eb515e054e3f0.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool/use-nativeperl.patch')
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool/use-nativeperl.patch | 20 |
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 @@ -OE has perl binary as 'nativeperl' in native sysroot so we look for it -in order to avoid intltool searching and finding perl from /usr/bin -on build system which may not have all the modules that it needs. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [OE specific] -Index: intltool-0.40.6/intltool.m4 -=================================================================== ---- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 -+++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700 -@@ -110,7 +110,7 @@ - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) - fi - --AC_PATH_PROG(INTLTOOL_PERL, perl) -+AC_PATH_PROG(INTLTOOL_PERL, nativeperl) - if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) - fi |