Patchwork [3/3] librsvg: make the libcroco dependency a PACKAGECONFIG option

login
register
mail settings
Submitter Ross Burton
Date Sept. 13, 2012, 10:04 a.m.
Message ID <1347530671-16622-3-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/36463/
State New
Headers show

Comments

Ross Burton - Sept. 13, 2012, 10:04 a.m.
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@intel.com>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Saul Wold - Sept. 14, 2012, 6:25 a.m.
On 09/13/2012 03:04 AM, Ross Burton wrote:
> 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@intel.com>
> ---
>   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> index 6bb5fe2..012b3ba 100644
> --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> @@ -7,15 +7,18 @@ 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"
>
> -PR = "r9"
> +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"
> +PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
>
This change seems to introduce a new native dependency on libcroco-native.

ERROR: Nothing PROVIDES 'libcroco-native' (but 
virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/build/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb 
DEPENDS on or otherwise requires it)

This was during a bitbake -c fetch universe

Sau!

>   SRC_URI += "file://doc_Makefile.patch"
>
>
Richard Purdie - Sept. 14, 2012, 8:56 a.m.
On Thu, 2012-09-13 at 23:25 -0700, Saul Wold wrote:
> On 09/13/2012 03:04 AM, Ross Burton wrote:
> > 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@intel.com>
> > ---
> >   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    9 ++++++---
> >   1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > index 6bb5fe2..012b3ba 100644
> > --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > @@ -7,15 +7,18 @@ 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"
> >
> > -PR = "r9"
> > +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"


Needs a 

+PACKAGECONFIG_class-native ??= ""

> > +PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
> >
> This change seems to introduce a new native dependency on libcroco-native.
> 
> ERROR: Nothing PROVIDES 'libcroco-native' (but 
> virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/build/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb 
> DEPENDS on or otherwise requires it)
> 
> This was during a bitbake -c fetch universe

Cheers,

Richard

Patch

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 6bb5fe2..012b3ba 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -7,15 +7,18 @@  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"
 
-PR = "r9"
+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"
+PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
 
 SRC_URI += "file://doc_Makefile.patch"