Patchwork [3/3] intltool(-native) Fix dependencies.

login
register
mail settings
Submitter ulf@emagii.com
Date Feb. 9, 2012, 8:20 p.m.
Message ID <1328818845-11049-3-git-send-email-ulf@emagii.com>
Download mbox | patch
Permalink /patch/21065/
State Accepted
Commit 53784a5e2622582ce5e2ffb91bbdb573503ed75e
Headers show

Comments

ulf@emagii.com - Feb. 9, 2012, 8:20 p.m.
From: Ulf Samuelsson <ulf@emagii.com>

intltool used to depend on libxml-parser-perl-native,
which did not exist.

The patch creates a new native recipe for libxml-parser-perl,
and let intltool-native depend on this.
intltool dependency is removed.

Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
---
 recipes/intltool/intltool-native_0.40.3.bb     |    2 +
 recipes/intltool/intltool_0.40.3.bb            |    2 -
 recipes/perl/libxml-parser-perl-native_2.36.bb |   32 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 recipes/perl/libxml-parser-perl-native_2.36.bb

Patch

diff --git a/recipes/intltool/intltool-native_0.40.3.bb b/recipes/intltool/intltool-native_0.40.3.bb
index 750914c..99d9b6a 100644
--- a/recipes/intltool/intltool-native_0.40.3.bb
+++ b/recipes/intltool/intltool-native_0.40.3.bb
@@ -1,5 +1,7 @@ 
 require intltool_${PV}.bb
 
+DEPENDS += " libxml-parser-perl-native"
+
 inherit native
 
 EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/env perl'"
diff --git a/recipes/intltool/intltool_0.40.3.bb b/recipes/intltool/intltool_0.40.3.bb
index bb2b75d..d81ce1a 100644
--- a/recipes/intltool/intltool_0.40.3.bb
+++ b/recipes/intltool/intltool_0.40.3.bb
@@ -2,8 +2,6 @@  require intltool.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += " libxml-parser-perl-native"
-
 EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'"
 
 do_configure_prepend() {
diff --git a/recipes/perl/libxml-parser-perl-native_2.36.bb b/recipes/perl/libxml-parser-perl-native_2.36.bb
new file mode 100644
index 0000000..e46cc59
--- /dev/null
+++ b/recipes/perl/libxml-parser-perl-native_2.36.bb
@@ -0,0 +1,32 @@ 
+DESCRIPTION = "XML::Parser - A perl module for parsing XML documents"
+SECTION = "libs"
+LICENSE = "Artistic|GPLv1+"
+DEPENDS += "expat expat-native"
+PR= "r4"
+
+SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
+
+S = "${WORKDIR}/XML-Parser-${PV}"
+
+EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
+
+inherit cpan
+inherit native
+
+do_compile() {
+	export LIBC="$(find ${STAGING_DIR_TARGET}/lib -name 'libc-*.so')"
+	cpan_do_compile
+}
+# 	cpan_do_compile	|| echo expected failure
+
+do_compile_virtclass-native (){
+	cpan_do_compile
+}
+
+FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \
+                ${PERLLIBDIRS}/XML"
+
+BBCLASSEXTEND="native"
+
+SRC_URI[md5sum] = "1b868962b658bd87e1563ecd56498ded"
+SRC_URI[sha256sum] = "9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f"