Patchwork [v3] intltool: include intltool.m4 and add missing rdepends

login
mail settings
Submitter Constantin Musca
Date Sept. 20, 2012, 11:06 a.m.
Message ID <1348139211-23176-1-git-send-email-constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/36963/
State New
Headers show

Comments

Constantin Musca - Sept. 20, 2012, 11:06 a.m.
- 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 gettext-dev rdepend: intltool.m4 references AM_NLS which is provided
by the gettext-dev package
- add libxml-parser-perl rdepend: intltool-merge aborts without the
perl XML parser (die "You must have XML::Parser installed to run $0\n\n";)

[YOCTO #2597]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-devtools/intltool/intltool.inc       |    9 ++++++++-
 meta/recipes-devtools/intltool/intltool_0.50.0.bb |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

Patch

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} \