[oe-commits] Ross Burton : librsvg: make the libcroco dependency a PACKAGECONFIG option

git at git.openembedded.org git at git.openembedded.org
Fri Sep 21 10:17:50 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: e177f1475c55c7d0bf3e2752e6502a7e8577a075
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e177f1475c55c7d0bf3e2752e6502a7e8577a075

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Sep  7 10:55:55 2012 +0100

librsvg: make the libcroco dependency a PACKAGECONFIG option

Default to enabling it as we were build-depending on it already.  If a user
needs the disk space and the limitations imposed by not using libcroco are
acceptable they can override this.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 12ae310..100b51e 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6"
 
 SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco cairo libxml2"
+DEPENDS = "gtk+ cairo libxml2"
 DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
 BBCLASSEXTEND = "native"
 
@@ -15,7 +15,13 @@ PR = "r10"
 
 inherit autotools pkgconfig gnome gtk-doc
 
-EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco"
+EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz"
+
+PACKAGECONFIG ??= "croco"
+# When native we can manage without croco, as it's only for GTK+
+PACKAGECONFIG_virtclass-native = ""
+
+PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
 
 SRC_URI += "file://doc_Makefile.patch"
 





More information about the Openembedded-commits mailing list