mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 18:53:13 +01:00
5d0f8a6db9
* Remove uclibc.patch as the whole localedir guessing code has been removed upstream. * Add patch to fix deprecation warnings (and the resulting broken install paths) when using Perl 5.22 (RB) (From OE-Core rev: bebbcb10f467b40cc9a2fb64c824f2ef4142f7fe) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
In the target case, we can't check if perl exists or try running it. If we
|
|
don't patch the code, the native perl location would be used, not the target
|
|
which is also incorrect. We therefore disable this code and rely on the
|
|
correct value of PERL being passed in.
|
|
|
|
RP 31/8/2011
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5338a76..e709a2b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -11,24 +11,10 @@ AC_SUBST(pkgdatadir) dnl automake does not need this, but libtoolize does
|
|
aclocaldir='${datadir}'/aclocal
|
|
AC_SUBST(aclocaldir)
|
|
|
|
-AC_PATH_PROG(PERL, perl)
|
|
if test -z "$PERL"; then
|
|
- AC_MSG_ERROR([perl not found])
|
|
-fi
|
|
-AC_MSG_CHECKING([for perl >= 5.8.1])
|
|
-$PERL -e "use 5.8.1;" > /dev/null 2>&1
|
|
-if test $? -ne 0; then
|
|
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
|
|
-else
|
|
- PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`"
|
|
- AC_MSG_RESULT([$PERL_VERSION])
|
|
-fi
|
|
-AC_MSG_CHECKING([for XML::Parser])
|
|
-if `$PERL -e "require XML::Parser" 2>/dev/null`; then
|
|
- AC_MSG_RESULT([ok])
|
|
-else
|
|
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
|
|
+ AC_MSG_ERROR([PERL variable not set])
|
|
fi
|
|
+AC_SUBST(PERL)
|
|
AC_PATH_PROG(BZR, bzr)
|
|
|
|
|