small build fixes for daisy

The following changes since commit 9ee63edfd9c6e5c22ce707770955a5796cde2cfc:

ltrace: add PV and PACKAGECONFIG for libunwind (2014-08-12 14:15:26 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib b90153d5981990ea9910c417a868fb26e7e264a4
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/daisy-backports

Martin Jansa (5):
sethdlc: Set MACHINE_ARCH, because of virtual/kernel dependency
ktap: Set MACHINE_ARCH because of ktap-module runtime dependency
glmark2: Add virtual/libx11 dependency
irssi: add --with-ncurses option
libgc: add PACKAGECONFIG for libatomic-ops

 meta-networking/recipes-connectivity/sethdlc/sethdlc.bb | 3 ++-
 meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb    | 7 +++++--
 meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb  | 5 +++--
 meta-oe/recipes-kernel/ktap/ktap_0.4.bb                 | 2 +-
 meta-oe/recipes-support/libgc/libgc_7.2d.bb             | 4 ++++
 5 files changed, 15 insertions(+), 6 deletions(-)

2.0.4

---
 meta-networking/recipes-connectivity/sethdlc/sethdlc.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 3a9692f..cf74827 100644
@@ -12,7 +12,8 @@ SRC_URI[sha256sum] = "21b1e2e1cb0e288b0ec8fcfd9fed449914e0f8e6fc273706bd5b3d4f6a
 
 S = "${WORKDIR}/${BPN}-1.18"
 
-DEPENDS="virtual/kernel"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+DEPENDS = "virtual/kernel"
 
 EXTRA_OEMAKE="CROSS_COMPILE=${TARGET_PREFIX} CC='${CC} ${LDFLAGS}' \
               KERNEL_DIR=${STAGING_KERNEL_DIR} "

2.0.4

* it's possible to exclude ktap-module dependency from siggen, but then we would need to exclude virtual/kernel and that doesn't work we would need to list all posisble providers as ktap->linux-yocto
ktap->linux-foo
....

---
 meta-oe/recipes-kernel/ktap/ktap_0.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 20f94d5..cbdabf8 100644
@@ -22,5 +22,5 @@ do_install() {
     install -m 0755 ${S}/ktap ${D}${bindir}/
 }
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 RDEPENDS_${PN} = "kernel-module-ktapvm"
-

2.0.4

* without it, do_configure fails:
| Checking for 'x11' : not found
| The configuration failed
* inherit distro_features_check

---
 meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

index 031e3b3..2efe6d6 100644
@@ -8,14 +8,17 @@ LICENSE = "GPLv3+ & SGIv1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552"
 
-DEPENDS = "libpng12 jpeg"
+DEPENDS = "libpng12 jpeg virtual/libx11"
+
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 
 SRC_URI[md5sum] = "4f306664aa3886fa0cf93853603603f8"
 SRC_URI[sha256sum] = "bea6f9de2cdce376195bd91e4a2fdfdf80bf3e480abff8e05b90a6458c1deb47"
 
-inherit waf pkgconfig
+inherit waf pkgconfig distro_features_check
 
 PACKAGECONFIG ?= "gl gles2"
 

2.0.4

* otherwise do_configure tries to find ncurses.h on host and
disables ncurses support when not found, then build fails because
of missing -lcurses when using terminfo-core.o:
| terminfo-core.o: In function `_set_bg':
| /OE/irssi/0.8.15+0.8.16-rc1-r0/irssi-0.8.16-rc1/src/fe-text/terminfo-core.c:343:
undefined reference to `tputs'

---
 meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

index 7880a06..1e27a2b 100644
@@ -17,5 +17,6 @@ S = "${WORKDIR}/irssi-${REALPV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--enable-ssl"
-
+EXTRA_OECONF = "--enable-ssl \
+    --with-ncurses=${STAGING_EXECPREFIXDIR} \
+"

2.0.4

---
 meta-oe/recipes-support/libgc/libgc_7.2d.bb | 4 ++++
 1 file changed, 4 insertions(+)

index b472a5d..66e6b92 100644
@@ -16,5 +16,9 @@ S = "${WORKDIR}/gc-7.2"
 
 inherit autotools
 
+# by default use external libatomic-ops
+PACKAGECONFIG ??= "libatomic-ops"
+PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomics-ops"
+
 PACKAGES =+ "${PN}-docs"
 FILES_${PN}-docs = "/usr/share/gc"

2.0.4

not sure if I acked already.