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 deleted file mode 100644 index 3d113efa15..0000000000 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0d49ee6416e389b9a7ba693588c2eaf129306a01 Mon Sep 17 00:00:00 2001 -From: Paul Barker -Date: Sun, 5 Nov 2017 22:07:30 +0000 -Subject: [PATCH] htop: Update to v2.0.2 - -We need to use pkg-config to find the ncurses library instead of the -ncurses*-config applications. - -Signed-off-by: Paul Barker -Signed-off-by: Robert Joslyn - -Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] - ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e4df238a..2a31b201 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -391,10 +391,10 @@ AC_ARG_ENABLE([unicode], - [], - [enable_unicode=yes]) - if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [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], -@@ -416,8 +416,8 @@ if test "x$enable_unicode" = xyes; then - # (at this point we already link against a working ncurses library with wide character support) - AC_SEARCH_LIBS([keypad], [tinfow tinfo]) - else -- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], -- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], -+ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], -+ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], - HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], diff --git a/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch b/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch new file mode 100644 index 0000000000..f00f3ac4db --- /dev/null +++ b/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch @@ -0,0 +1,50 @@ +From 87d66b3b60176197e785670214b0bbc5bedd6552 Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Mon, 8 Dec 2025 11:06:01 +0000 +Subject: [PATCH] configure.ac: Remove /usr/include/libnl3 + +Fixes: + +| configure: error: can not find required header files +netlink/attr.h, netlink/handlers.h, netlink/msg.h + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Leon Anavi +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9f2f46b3..f3906692 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -980,14 +980,14 @@ case "$enable_delayacct" in + enable_delayacct=no + else + old_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I/usr/include/libnl3" ++ CFLAGS="$CFLAGS" + AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [enable_delayacct=yes], [enable_delayacct=no]) + CFLAGS="$old_CFLAGS" + fi + ;; + yes) + old_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I/usr/include/libnl3" ++ CFLAGS="$CFLAGS" + AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [], [AC_MSG_ERROR([can not find required header files netlink/attr.h, netlink/handlers.h, netlink/msg.h])]) + CFLAGS="$old_CFLAGS" + ;; +@@ -997,7 +997,7 @@ case "$enable_delayacct" in + esac + if test "$enable_delayacct" = yes; then + AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.]) +- AM_CFLAGS="$AM_CFLAGS -I/usr/include/libnl3" ++ AM_CFLAGS="$AM_CFLAGS" + fi + AM_CONDITIONAL([HAVE_DELAYACCT], [test "$enable_delayacct" = yes]) + +-- +2.47.3 + diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.4.1.bb similarity index 86% rename from meta-oe/recipes-support/htop/htop_3.3.0.bb rename to meta-oe/recipes-support/htop/htop_3.4.1.bb index efb89bf3ae..e3f8a7fdb4 100644 --- a/meta-oe/recipes-support/htop/htop_3.3.0.bb +++ b/meta-oe/recipes-support/htop/htop_3.4.1.bb @@ -4,16 +4,18 @@ SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "ncurses" +DEPENDS = "ncurses libnl" SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ - file://0001-Use-pkg-config.patch \ + file://0001-configure.ac-Remove-usr-include-libnl3.patch \ " -SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" +SRCREV = "348c0a6bf4f33571835a0b6a1a0f5deb15132128" inherit autotools pkgconfig +CFLAGS += " -I${STAGING_INCDIR}/libnl3" + PACKAGECONFIG ??= " \ unicode \ affinity \