summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-09-19 12:59:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 11:10:22 +0100
commit621fec0277e5c53fe35bc0f1dc4d6892f01c51b1 (patch)
treec3a8adbd6d8e3ae0e3d3fc4dca6c175410468737
parent4946185084abba516988f61a911bd60f61a49168 (diff)
downloadast2050-yocto-poky-621fec0277e5c53fe35bc0f1dc4d6892f01c51b1.zip
ast2050-yocto-poky-621fec0277e5c53fe35bc0f1dc4d6892f01c51b1.tar.gz
intltool: include intltool.m4 and add missing rdepends
- include /usr/share/aclocal/intltool.m4 into the intltool package (the files from intltool-dev must be included into the main package, as intltool is a development tool) - add missing rdepends: gettext-dev, libxml-parser-perl [YOCTO #2597] (From OE-Core rev: f5f3d3fb14e983af114afc6425dc339053927f25) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc9
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.50.0.bb2
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 1c41f0f..59974d8 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -7,11 +7,18 @@ 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_virtclass-native = "libxml-parser-perl-native"
-#RDEPENDS_${PN} = "libxml-parser-perl"
+# gettext is assumed to exist on the host
+RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
RRECOMMENDS_${PN} = "perl-modules"
RRECOMMENDS_${PN}_virtclass-native = ""
+FILES_${PN}-dev = ""
+FILES_${PN} += "${datadir}/aclocal"
+
+INSANE_SKIP_${PN} += "dev-deps"
+
inherit autotools pkgconfig perlnative
export PERL = "${bindir}/env perl"
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.0.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
index d1ee31d..fa9850f 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.0.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
@@ -1,7 +1,7 @@
require intltool.inc
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://intltool-nowarn-0.50.0.patch \
${NATIVEPATCHES} \
OpenPOWER on IntegriCloud