diff options
Diffstat (limited to 'meta/recipes-devtools/intltool')
6 files changed, 183 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch new file mode 100644 index 000000000..ff9f52e21 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch @@ -0,0 +1,52 @@ +Upstream-Status: Inappropriate [embedded specific] + +Index: intltool-0.40.0/intltool-extract.in +=================================================================== +--- intltool-0.40.0.orig/intltool-extract.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-extract.in 2008-12-17 11:50:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.40.0/intltool-merge.in +=================================================================== +--- intltool-0.40.0.orig/intltool-merge.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-merge.in 2008-12-17 11:50:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.40.0/intltool-prepare.in +=================================================================== +--- intltool-0.40.0.orig/intltool-prepare.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-prepare.in 2008-12-17 11:50:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # Intltool .desktop, .directory Prepare Tool +Index: intltool-0.40.0/intltool-unicodify.in +=================================================================== +--- intltool-0.40.0.orig/intltool-unicodify.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-unicodify.in 2008-12-17 11:50:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + + # + # The i18n Unicode Encoding Utility +Index: intltool-0.40.0/intltool-update.in +=================================================================== +--- intltool-0.40.0.orig/intltool-update.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-update.in 2008-12-17 11:50:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch new file mode 100644 index 000000000..3d8b591a4 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch @@ -0,0 +1,40 @@ +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] + +Index: intltool-0.40.6/configure.in +=================================================================== +--- intltool-0.40.6.orig/configure.in 2011-08-31 11:21:13.061160535 +0100 ++++ intltool-0.40.6/configure.in 2011-08-31 11:22:44.991160885 +0100 +@@ -9,24 +9,10 @@ + 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_OUTPUT([ + Makefile diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch new file mode 100644 index 000000000..2eb9abd06 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch @@ -0,0 +1,32 @@ + +Upstream-Status: Inappropriate [configuration] + +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-11-23 15:39:34.689561872 -0800 +@@ -122,14 +122,16 @@ + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) + fi +-if test "x$2" != "xno-xml"; then +- AC_MSG_CHECKING([for XML::Parser]) +- if `$INTLTOOL_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]) +- fi +-fi ++ ++# Disable this check since we know XML::Parser is installed ++#if test "x$2" != "xno-xml"; then ++# AC_MSG_CHECKING([for XML::Parser]) ++# if `$INTLTOOL_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]) ++# fi ++#fi + + # Substitute ALL_LINGUAS so we can use it in po/Makefile + AC_SUBST(ALL_LINGUAS) 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 000000000..5f5fed385 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch @@ -0,0 +1,20 @@ +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 diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc new file mode 100644 index 000000000..8d983dfc6 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Utility scripts for internationalizing XML" +SECTION = "devel" +LICENSE = "GPLv2" + +URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" +SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +DEPENDS = "libxml-parser-perl-native" +DEPENDS_virtclass-native = "libxml-parser-perl-native" +#RDEPENDS_${PN} = "libxml-parser-perl" +RRECOMMENDS_${PN} = "perl-modules" +RRECOMMENDS_${PN}_virtclass-native = "" + +inherit autotools pkgconfig perlnative + +export PERL = "${bindir}/env perl" +PERL_virtclass-native = "/usr/bin/env nativeperl" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb new file mode 100644 index 000000000..c820f11bf --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb @@ -0,0 +1,19 @@ +require intltool.inc +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r6" + +SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ + ${NATIVEPATCHES} \ + " + +# +# All of the intltool scripts have the correct paths to perl already +# embedded into them and can find perl fine, so we add the remove xml-check +# in the intltool.m4 via the remove-xml-check.patch +NATIVEPATCHES = "file://noperlcheck.patch \ + file://remove-xml-check.patch" +NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" + +SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" +SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64" |