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 index f00f3ac4db..c1f763ce17 100644 --- 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 @@ -1,6 +1,6 @@ -From 87d66b3b60176197e785670214b0bbc5bedd6552 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Mon, 8 Dec 2025 11:06:01 +0000 +From 652b208b8c3038934fb55169f44068bbdf399b69 Mon Sep 17 00:00:00 2001 +From: Liu Yiding +Date: Wed, 15 Apr 2026 01:34:56 +0000 Subject: [PATCH] configure.ac: Remove /usr/include/libnl3 Fixes: @@ -11,40 +11,35 @@ netlink/attr.h, netlink/handlers.h, netlink/msg.h Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Leon Anavi + +Update for 3.5.0. +Signed-off-by: Liu Yiding --- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 9f2f46b3..f3906692 100644 +index 2d174d73..ee8b29ca 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" +@@ -1638,7 +1638,7 @@ case "$enable_delayacct" in + + htop_save_CFLAGS=$CFLAGS + # New include path searched after what user has specified +- CFLAGS="$CFLAGS $LIBNL3_CFLAGS" + 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 + AC_CHECK_HEADERS( + [netlink/attr.h netlink/handlers.h netlink/msg.h], + [], +@@ -1681,7 +1681,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" + AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.]) +- AM_CFLAGS="$AM_CFLAGS $LIBNL3_CFLAGS" ++ AM_CFLAGS="$AM_CFLAGS" fi AM_CONDITIONAL([HAVE_DELAYACCT], [test "$enable_delayacct" = yes]) -- -2.47.3 +2.43.0 diff --git a/meta-oe/recipes-support/htop/htop_3.4.1.bb b/meta-oe/recipes-support/htop/htop_3.5.0.bb similarity index 89% rename from meta-oe/recipes-support/htop/htop_3.4.1.bb rename to meta-oe/recipes-support/htop/htop_3.5.0.bb index e3f8a7fdb4..961a87097b 100644 --- a/meta-oe/recipes-support/htop/htop_3.4.1.bb +++ b/meta-oe/recipes-support/htop/htop_3.5.0.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libnl" -SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https;tag=${PV} \ file://0001-configure.ac-Remove-usr-include-libnl3.patch \ " -SRCREV = "348c0a6bf4f33571835a0b6a1a0f5deb15132128" +SRCREV = "a21f043b253a6dfa89df1ff4130fe7d2e505000f" inherit autotools pkgconfig @@ -23,7 +23,7 @@ PACKAGECONFIG ??= " \ " PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc" -PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind" +PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity" PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver"