diff mbox series

[meta-oe,13/26] atop: use wide ncurses pkg-config cflags so waddwstr is declared

Message ID 20260929225723.1046705-13-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,01/26] canvenient: include <sys/time.h> for struct timeval on musl | expand

Commit Message

Khem Raj Sept. 29, 2026, 10:57 p.m. UTC 
atop calls the wide-character ncurses function waddwstr(), which
needs NCURSES_WIDECHAR defined; get that (and the right include path)
from the ncursesw pkg-config module's own Cflags instead of hardcoding
plain ncurses flags.

AI-Generated: Uses Claude Code

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../atop/atop/ncursesw-pkgconfig-cflags.patch | 29 +++++++++++++++++++
 meta-oe/recipes-support/atop/atop_2.13.0.bb   |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-oe/recipes-support/atop/atop/ncursesw-pkgconfig-cflags.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/atop/atop/ncursesw-pkgconfig-cflags.patch b/meta-oe/recipes-support/atop/atop/ncursesw-pkgconfig-cflags.patch
new file mode 100644
index 0000000000..60441f4ab4
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/ncursesw-pkgconfig-cflags.patch
@@ -0,0 +1,29 @@ 
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Tue, 29 Sep 2026 01:56:24 +0000
+Subject: [PATCH] Makefile: pull in ncursesw cflags via pkg-config
+
+atop links against libncursesw and calls wide-character curses
+functions such as waddwstr(), which ncurses only declares in
+curses.h when NCURSES_WIDECHAR is defined (normally via the
+`-DNCURSES_WIDECHAR` cflag reported by `pkg-config --cflags
+ncursesw`). The Makefile only queried pkg-config for glib-2.0 cflags
+and never queried it for ncursesw, so on distros shipping a unified
+curses.h (as this OE ncurses recipe does) waddwstr() is left
+undeclared and the build fails under -Werror=implicit-function-declaration.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+diff --git a/Makefile b/Makefile
+index 3a73bd2..7d1a3c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@
+
+ PKG_CONFIG ?= pkg-config
+
+-override CFLAGS  := -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT   # -DHTTPSTATS
++override CFLAGS  := -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) $(shell $(PKG_CONFIG) --cflags ncursesw) -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT   # -DHTTPSTATS
+
+ CC_CHECK := $(shell echo | $(CC) -dM -E - | grep -q __clang__ && echo clang || echo gcc)
+ ifeq ($(CC_CHECK),gcc)
diff --git a/meta-oe/recipes-support/atop/atop_2.13.0.bb b/meta-oe/recipes-support/atop/atop_2.13.0.bb
index 625a7b0937..28292f244a 100644
--- a/meta-oe/recipes-support/atop/atop_2.13.0.bb
+++ b/meta-oe/recipes-support/atop/atop_2.13.0.bb
@@ -21,6 +21,7 @@  SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \
            ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
            file://fix-permissions.patch \
            file://sysvinit-implement-status.patch \
+           file://ncursesw-pkgconfig-cflags.patch \
            "
 SRC_URI[sha256sum] = "ea182f84c9f52ca922e5af4f17dff97ff424400a4f2f92393317a6af66e6a874"