From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../intltool/intltool-0.50.2/intltool-nowarn.patch | 42 ++++++++++++++++++++++ .../intltool/intltool-0.50.2/noperlcheck.patch | 40 +++++++++++++++++++++ .../intltool-0.50.2/remove-xml-check.patch | 33 +++++++++++++++++ .../intltool/intltool-0.50.2/uclibc.patch | 19 ++++++++++ .../intltool/intltool-0.50.2/use-nativeperl.patch | 20 +++++++++++ meta/recipes-devtools/intltool/intltool.inc | 27 ++++++++++++++ meta/recipes-devtools/intltool/intltool_0.50.2.bb | 19 ++++++++++ 7 files changed, 200 insertions(+) create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch create mode 100644 meta/recipes-devtools/intltool/intltool.inc create mode 100644 meta/recipes-devtools/intltool/intltool_0.50.2.bb (limited to 'meta/recipes-devtools/intltool') 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 @@ +Upstream-Status: Inappropriate [embedded specific] + +Index: intltool-0.40.0/intltool-extract.in +=================================================================== +--- intltool-0.50.0.orig/intltool-extract.in 2011-10-08 22:24:57.000000000 +0300 ++++ intltool-0.50.0/intltool-extract.in 2011-12-07 16:04:07.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.50.0/intltool-merge.in +=================================================================== +--- intltool-0.50.0.orig/intltool-merge.in 2011-10-08 17:52:01.000000000 +0300 ++++ intltool-0.50.0/intltool-merge.in 2011-12-07 16:05:55.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.50.0/intltool-prepare.in +=================================================================== +--- intltool-0.50.0.orig/intltool-prepare.in 2011-10-08 09:16:58.000000000 +0300 ++++ intltool-0.50.0/intltool-prepare.in 2011-12-07 16:06:13.000000000 +0200 +@@ -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.50.0/intltool-update.in +=================================================================== +--- intltool-0.50.0.orig/intltool-update.in 2011-10-08 22:24:57.000000000 +0300 ++++ intltool-0.50.0/intltool-update.in 2011-12-07 16:06:39.000000000 +0200 +@@ -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.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 @@ +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) + + 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 @@ +Signed-off-by: Florin Sarbu + +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-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.50.2/uclibc.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch new file mode 100644 index 0000000000..145c181f17 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch @@ -0,0 +1,19 @@ +on uclibc systems localedir should point to /usr/'share' as usual. + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: intltool-0.50.2/intltool.m4 +=================================================================== +--- intltool-0.50.2.orig/intltool.m4 2014-03-15 22:09:01.016627665 -0700 ++++ intltool-0.50.2/intltool.m4 2014-03-15 22:12:09.732631206 -0700 +@@ -173,6 +173,9 @@ + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; ++ *-*-*uclibc*) ++ [DATADIRNAME=share] ++ ;; + *) + [DATADIRNAME=lib] + ;; 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 @@ +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 + +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 0000000000..be77704208 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -0,0 +1,27 @@ +SUMMARY = "Utility scripts for internationalizing XML" +SECTION = "devel" +LICENSE = "GPLv2" + +URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" +SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz" +S = "${WORKDIR}/intltool-${PV}" + +DEPENDS = "libxml-parser-perl-native" +RDEPENDS_${PN} = "gettext-dev libxml-parser-perl" +DEPENDS_class-native = "libxml-parser-perl-native" +# gettext is assumed to exist on the host +RDEPENDS_${PN}_class-native = "libxml-parser-perl-native" +RRECOMMENDS_${PN} = "perl-modules" +RRECOMMENDS_${PN}_class-native = "" + +FILES_${PN}-dev = "" +FILES_${PN} += "${datadir}/aclocal" + +INSANE_SKIP_${PN} += "dev-deps" + +inherit autotools pkgconfig perlnative + +export PERL = "${bindir}/env perl" +PERL_class-native = "/usr/bin/env nativeperl" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/intltool/intltool_0.50.2.bb b/meta/recipes-devtools/intltool/intltool_0.50.2.bb new file mode 100644 index 0000000000..483239d472 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool_0.50.2.bb @@ -0,0 +1,19 @@ +require intltool.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI += "file://intltool-nowarn.patch \ + file://uclibc.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_class-native = "file://use-nativeperl.patch" + +SRC_URI[md5sum] = "23fbd879118253cb99aeac067da5f591" +SRC_URI[sha256sum] = "67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406" -- cgit v1.2.3-54-g00ecf