summaryrefslogtreecommitdiffstats
path: root/meta
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 /meta
parent4946185084abba516988f61a911bd60f61a49168 (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-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 1c41f0ff41..59974d80d8 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"
7S = "${WORKDIR}/intltool-${PV}" 7S = "${WORKDIR}/intltool-${PV}"
8 8
9DEPENDS = "libxml-parser-perl-native" 9DEPENDS = "libxml-parser-perl-native"
10RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
10DEPENDS_virtclass-native = "libxml-parser-perl-native" 11DEPENDS_virtclass-native = "libxml-parser-perl-native"
11#RDEPENDS_${PN} = "libxml-parser-perl" 12# gettext is assumed to exist on the host
13RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
12RRECOMMENDS_${PN} = "perl-modules" 14RRECOMMENDS_${PN} = "perl-modules"
13RRECOMMENDS_${PN}_virtclass-native = "" 15RRECOMMENDS_${PN}_virtclass-native = ""
14 16
17FILES_${PN}-dev = ""
18FILES_${PN} += "${datadir}/aclocal"
19
20INSANE_SKIP_${PN} += "dev-deps"
21
15inherit autotools pkgconfig perlnative 22inherit autotools pkgconfig perlnative
16 23
17export PERL = "${bindir}/env perl" 24export 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 d1ee31dd41..fa9850fe09 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 @@
1require intltool.inc 1require intltool.inc
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI += "file://intltool-nowarn-0.50.0.patch \ 6SRC_URI += "file://intltool-nowarn-0.50.0.patch \
7 ${NATIVEPATCHES} \ 7 ${NATIVEPATCHES} \