summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/intltool/intltool-0.50.2
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-02-05 18:13:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 09:37:26 +0000
commitb2d06ba92924ff405160bc632e747f30b93f78a9 (patch)
tree832f3c410b3b7d5b25a9d1ae6b46e6fd859fbb78 /meta/recipes-devtools/intltool/intltool-0.50.2
parent10f05d5b5866317a8c2de09455b548ff848afecd (diff)
downloadpoky-b2d06ba92924ff405160bc632e747f30b93f78a9.tar.gz
intltool: updated to 0.50.2
(From OE-Core rev: f0f5507f30b5d8d919e93cb6af6b724981e9cfef) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool-0.50.2')
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch42
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch40
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch33
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch20
4 files changed, 135 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch
new file mode 100644
index 0000000000..06c938b7e3
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: intltool-0.40.0/intltool-extract.in
4===================================================================
5--- intltool-0.50.0.orig/intltool-extract.in 2011-10-08 22:24:57.000000000 +0300
6+++ intltool-0.50.0/intltool-extract.in 2011-12-07 16:04:07.000000000 +0200
7@@ -1,4 +1,4 @@
8-#!@INTLTOOL_PERL@ -w
9+#!@INTLTOOL_PERL@
10 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
11
12 #
13Index: intltool-0.50.0/intltool-merge.in
14===================================================================
15--- intltool-0.50.0.orig/intltool-merge.in 2011-10-08 17:52:01.000000000 +0300
16+++ intltool-0.50.0/intltool-merge.in 2011-12-07 16:05:55.000000000 +0200
17@@ -1,4 +1,4 @@
18-#!@INTLTOOL_PERL@ -w
19+#!@INTLTOOL_PERL@
20 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
21
22 #
23Index: intltool-0.50.0/intltool-prepare.in
24===================================================================
25--- intltool-0.50.0.orig/intltool-prepare.in 2011-10-08 09:16:58.000000000 +0300
26+++ intltool-0.50.0/intltool-prepare.in 2011-12-07 16:06:13.000000000 +0200
27@@ -1,4 +1,4 @@
28-#!@INTLTOOL_PERL@ -w
29+#!@INTLTOOL_PERL@
30 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
31
32 # Intltool .desktop, .directory Prepare Tool
33Index: intltool-0.50.0/intltool-update.in
34===================================================================
35--- intltool-0.50.0.orig/intltool-update.in 2011-10-08 22:24:57.000000000 +0300
36+++ intltool-0.50.0/intltool-update.in 2011-12-07 16:06:39.000000000 +0200
37@@ -1,4 +1,4 @@
38-#!@INTLTOOL_PERL@ -w
39+#!@INTLTOOL_PERL@
40 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
41
42 #
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch
new file mode 100644
index 0000000000..853ee1a438
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.2/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
10diff --git a/configure.ac b/configure.ac
11index 5338a76..e709a2b 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -11,24 +11,10 @@ AC_SUBST(pkgdatadir) dnl automake does not need this, but libtoolize does
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 AC_PATH_PROG(BZR, bzr)
39
40
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
new file mode 100644
index 0000000000..fc69e37b45
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
@@ -0,0 +1,33 @@
1Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
2
3Upstream-Status: Inappropriate [OE specific]
4
5Index: intltool-0.40.6/intltool.m4
6===================================================================
7--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800
8+++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800
9@@ -122,14 +122,16 @@
10 IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
11 AC_MSG_RESULT([$IT_PERL_VERSION])
12 fi
13-if test "x$2" != "xno-xml"; then
14- AC_MSG_CHECKING([for XML::Parser])
15- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
16- AC_MSG_RESULT([ok])
17- else
18- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
19- fi
20-fi
21+
22+# Disable this check since we know XML::Parser is installed
23+#if test "x$2" != "xno-xml"; then
24+# AC_MSG_CHECKING([for XML::Parser])
25+# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
26+# AC_MSG_RESULT([ok])
27+# else
28+# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
29+# fi
30+#fi
31
32 # Substitute ALL_LINGUAS so we can use it in po/Makefile
33 AC_SUBST(ALL_LINGUAS)
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch
new file mode 100644
index 0000000000..5f5fed3853
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.2/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