| Summary: | make the world build work without x11 in DISTRO_FEATURES | ||
|---|---|---|---|
| Product: | [Build System, Metadata & Runtime] OE-Core | Reporter: | Robert Yang <liezhi.yang> |
| Component: | core | Assignee: | Robert Yang <liezhi.yang> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | enhancement | ||
| Priority: | Medium | CC: | bluelightning, mark.hatle, meta.mr.watcher, meta.watcher, sgw |
| Version: | 1.9 | ||
| Target Milestone: | 1.9 M3 | ||
| Hardware: | x86 | ||
| OS: | Multiple | ||
| Whiteboard: | |||
| OS type for building Yocto: | --- | Type of Regression: | --- |
| Verified: | Documentation change: | No (bug/feature does not impact docs) | |
|
Description
Robert Yang
2015-05-06 03:06:14 UTC
Most of the patches have been merged, the only left one is: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=b2a93ca8e853d6479983408e6294c7fb38159c92 http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=5f21aa0776bef90142116344cbb6280434bf4eec http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f744f0b18c22daf8bdab837ba8096760b1ce00b8 http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=0ac9aa19373d1b7ecdf15a8b2adb07c9c947b164 [snip] The only left one is, I will file new defect in 2.1 to track it. The gtk+2 requires whether x11 or directfb to build, so we need enable either of them. The cairo can be built without x11 or directfb, but gtk+ requires cairo, so enable x11 or directfb for cairo, too. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- meta/recipes-gnome/gtk+/gtk+.inc | 5 ++--- meta/recipes-graphics/cairo/cairo.inc | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index be5273d..9d697cdb 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -17,9 +17,8 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ cairo gdk-pixbuf" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ -" +# Requires x11 or directfb +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'directfb', d)}" PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 1e45318..f6474bc 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -17,8 +17,12 @@ LICENSE_${PN}-perf-utils = "GPLv3+" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" +# Build cairo-xlib or cairo-directfb for gtk+ +PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', 'directfb', d)} \ + " + +# No directfb-native, so set PACKAGECONFIG to null when no x11 +PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" |