On 10/25/2012 05:55 AM, Jack Mitchell wrote:
From: Jack Mitchell <[email protected]>
When DISTRO_FEATURES does not contain x11, disable GTK GUI and
also don't add gtk+ to the DEPENDS
Signed-off-by: Jack Mitchell <[email protected]>
---
.../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------
meta/recipes-kernel/latencytop/latencytop_0.5.bb | 6 ++++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index 59a0b1f..596450c 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
@@ -1,8 +1,9 @@
-Upstream-Status: Inappropriate [configuration]
-
---- a/Makefile 2010-07-20 18:51:32.000000000 +0800
-+++ b/Makefile 2010-07-20 18:54:54.000000000 +0800
-@@ -4,7 +4,8 @@
+--- a/Makefile 2010-07-20 18:51:32.000000000 +0800
++++ b/Makefile 2010-07-20 18:54:54.000000000 +0800
+@@ -1,10 +1,8 @@
+-# FIXME: Use autoconf ?
+-HAS_GTK_GUI = 1
+-
DESTDIR =
SBINDIR = /usr/sbin
XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2
-Wno-sign-compare
@@ -12,7 +13,7 @@ Upstream-Status: Inappropriate [configuration]
OBJS= latencytop.o text_display.o translate.o fsync.o
-@@ -26,16 +27,17 @@
+@@ -26,16 +24,17 @@
# We write explicity this "implicit rule"
%.o : %.c
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index 15f3667..2429b3d 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "n/a"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM =
"file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
-DEPENDS = "virtual/libintl ncurses glib-2.0 gtk+"
+DEPENDS = "virtual/libintl ncurses glib-2.0 ${@base_contains('DISTRO_FEATURES',
'x11', 'gtk+', '', d)}"
PR = "r2"
@@ -15,8 +15,10 @@ SRC_URI =
"http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
SRC_URI[sha256sum] =
"9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
+EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '-DHAS_GTK_GUI=1', '',
d)}"
+
This does not seem to make sense here, you are saying OECONF, but
passing it below to "make", so maybe this should be EXTRA_OEMAKE_X.
Also this seems to generate the following error:
| NOTE: make -j 16 -e MAKEFLAGS= install
DESTDIR=/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86-64/build/build/tmp/work/x86_64-poky-linux/latencytop-0.5-r2/image
-DHAS_GTK_GUI=1
| make: invalid option -- 'D'
| make: invalid option -- 'H'
| make: invalid option -- 'A'
| make: invalid option -- '_'
| make: invalid option -- 'G'
| make: invalid option -- 'T'
| make: invalid option -- 'K'
| make: invalid option -- '_'
| make: invalid option -- 'G'
| make: invalid option -- 'U'
| Usage: make [options] [target] ...
| Options:
| -b, -m Ig
...
Please revisit this patch.
Thanks
Sau!
CFLAGS += "${LDFLAGS}"
do_install() {
- oe_runmake install DESTDIR=${D}
+ oe_runmake install DESTDIR=${D} ${EXTRA_OECONF_X}
}
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
