From: Jack Mitchell <ml@communistcode.co.uk>
To: openembedded-devel@lists.openembedded.org
Cc: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Subject: [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy
Date: Mon, 29 Oct 2012 09:28:12 +0000 [thread overview]
Message-ID: <1351502894-2303-2-git-send-email-ml@communistcode.co.uk> (raw)
In-Reply-To: <1351502894-2303-1-git-send-email-ml@communistcode.co.uk>
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
When DISTRO_FEATURES does not contain x11, disable GTK GUI and
also don't add gtk+ to the DEPENDS
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
.../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------
meta/recipes-kernel/latencytop/latencytop_0.5.bb | 8 +++++---
2 files changed, 12 insertions(+), 9 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..3e35bf9 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -5,9 +5,9 @@ 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"
+PR = "r3"
SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
file://latencytop-makefile.patch"
@@ -15,8 +15,10 @@ SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
+EXTRA_OEMAKE_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}"
+
CFLAGS += "${LDFLAGS}"
do_install() {
- oe_runmake install DESTDIR=${D}
+ oe_runmake install DESTDIR=${D} ${EXTRA_OEMAKE_X}
}
--
1.8.0
next prev parent reply other threads:[~2012-10-29 9:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 9:28 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell
2012-10-29 9:28 ` Jack Mitchell [this message]
2012-10-29 9:28 ` [PATCH 2/3] packagegroup-core-tools-profile: include sysprof only if x11 is distro feature Jack Mitchell
2012-10-29 9:28 ` [PATCH 3/3] babeltrace: fix depends Jack Mitchell
2012-10-29 9:30 ` [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell
-- strict thread matches above, loose matches on Subject: below --
2012-10-29 9:28 Jack Mitchell
2012-10-29 9:28 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell
2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell
2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell
2012-10-26 13:39 ` Jack Mitchell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351502894-2303-2-git-send-email-ml@communistcode.co.uk \
--to=ml@communistcode.co.uk \
--cc=jack.mitchell@dbbroadcast.co.uk \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.