* [PATCH] cairo: only use x11 if selected in DISTRO_FEATURES
@ 2011-08-12 15:58 Phil Blundell
2011-08-15 17:07 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Phil Blundell @ 2011-08-12 15:58 UTC (permalink / raw)
To: oe-core
This makes it possible to build cairo-using apps without X11.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/recipes-graphics/cairo/cairo.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 72aaa03..c983a89 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -10,10 +10,11 @@ HOMEPAGE = "http://cairographics.org"
BUGTRACKER = "http://bugs.freedesktop.org"
SECTION = "libs"
LICENSE = "MPL-1 & LGPLv2.1"
-DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0"
+X11DEPENDS = "virtual/libx11 libsm libxrender"
+DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require cairo-fpu.inc
-EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
+EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
inherit autotools pkgconfig
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cairo: only use x11 if selected in DISTRO_FEATURES
2011-08-12 15:58 [PATCH] cairo: only use x11 if selected in DISTRO_FEATURES Phil Blundell
@ 2011-08-15 17:07 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2011-08-15 17:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Phil Blundell
On 08/12/2011 08:58 AM, Phil Blundell wrote:
> This makes it possible to build cairo-using apps without X11.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
> meta/recipes-graphics/cairo/cairo.inc | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
> index 72aaa03..c983a89 100644
> --- a/meta/recipes-graphics/cairo/cairo.inc
> +++ b/meta/recipes-graphics/cairo/cairo.inc
> @@ -10,10 +10,11 @@ HOMEPAGE = "http://cairographics.org"
> BUGTRACKER = "http://bugs.freedesktop.org"
> SECTION = "libs"
> LICENSE = "MPL-1& LGPLv2.1"
> -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0"
> +X11DEPENDS = "virtual/libx11 libsm libxrender"
> +DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
>
> #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
> require cairo-fpu.inc
> -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
> +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
>
> inherit autotools pkgconfig
Merged into OE Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-15 17:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-12 15:58 [PATCH] cairo: only use x11 if selected in DISTRO_FEATURES Phil Blundell
2011-08-15 17:07 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox