From: Paul Barker <pbarker@toganlabs.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH 6/8] htop: Update to v2.0.2
Date: Sun, 5 Nov 2017 22:07:30 +0000 [thread overview]
Message-ID: <1509919652-31388-7-git-send-email-pbarker@toganlabs.com> (raw)
In-Reply-To: <1509919652-31388-1-git-send-email-pbarker@toganlabs.com>
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
.../htop/files/0001-Use-pkg-config.patch | 46 ++++++++++++++++++++++
.../htop/{htop_1.0.3.bb => htop_2.0.2.bb} | 9 +++--
2 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
rename meta-oe/recipes-support/htop/{htop_1.0.3.bb => htop_2.0.2.bb} (58%)
diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
new file mode 100644
index 0000000..ff5cd49
--- /dev/null
+++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
@@ -0,0 +1,46 @@
+From 7ebcbf17ad9483c7109e4a83b66966bc02f09bd4 Mon Sep 17 00:00:00 2001
+From: Paul Barker <pbarker@toganlabs.com>
+Date: Sun, 5 Nov 2017 20:10:10 +0000
+Subject: [PATCH] Use pkg-config
+
+We need to use pkg-config to find the ncurses library instead of the
+ncurses*-config applications.
+
+Signed-off-by: Paul Barker <pbarker@toganlabs.com>
+Upstream-status: Inappropriate
+ (`ncurses*-config` can be used outside of OpenEmbedded)
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7e0edd1..c5a8365 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,9 +185,9 @@ m4_define([HTOP_CHECK_LIB],
+
+ AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
++ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5",
++ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5",
+ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+@@ -200,8 +200,8 @@ if test "x$enable_unicode" = xyes; then
+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+ else
+- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
++ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6",
++ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5",
+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
+ missing_libraries="$missing_libraries libncurses"
+--
+2.7.4
+
diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb
similarity index 58%
rename from meta-oe/recipes-support/htop/htop_1.0.3.bb
rename to meta-oe/recipes-support/htop/htop_2.0.2.bb
index 181661a..395b83f 100644
--- a/meta-oe/recipes-support/htop/htop_1.0.3.bb
+++ b/meta-oe/recipes-support/htop/htop_2.0.2.bb
@@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
DEPENDS = "ncurses"
RDEPENDS_${PN} = "ncurses-terminfo"
-SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz"
+SRC_URI = " \
+ http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz \
+ file://0001-Use-pkg-config.patch \
+ "
-SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7"
-SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829"
+SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a"
+SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487"
LDFLAGS_append_libc-uclibc = " -lubacktrace"
--
2.7.4
next prev parent reply other threads:[~2017-11-05 22:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-05 22:07 [meta-oe][PATCH 0/8] Recipe updates and an addition Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 1/8] toybox: Switch to v0.7.5 release Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 2/8] mercurial: Update to v4.4 Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 3/8] mercurial: Support building for target Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 4/8] dash: Update to v0.5.9.1 Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 5/8] ddrescue: Update to v1.22 Paul Barker
2017-11-05 22:07 ` Paul Barker [this message]
2017-11-05 22:07 ` [meta-oe][PATCH 7/8] tmux: Update to v2.6 Paul Barker
2017-11-05 22:07 ` [meta-oe][PATCH 8/8] dumb-init: New recipe Paul Barker
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=1509919652-31388-7-git-send-email-pbarker@toganlabs.com \
--to=pbarker@toganlabs.com \
--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.