[openwrt/openwrt] strace: use bundled kernel headers

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 21 02:42:57 PST 2026


jogo pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e7873c4d7ee771b1f975986cf81ecf31d692580f

commit e7873c4d7ee771b1f975986cf81ecf31d692580f
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Wed Jan 14 10:30:55 2026 +0100

    strace: use bundled kernel headers
    
    Build against the bundled kernel headers instead of using the current
    kernel ones. This ensures strace is using the kernel headers it is
    written against, and not a random one that may contain breaking uapi
    changes (which happen from time to time).
    
    Fixes build against 6.18 final and recent LTS/stable kernels that got
    minor uapi breakages (rename of a 6.18 introduced #define and a struct
    field).
    
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
 package/devel/strace/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index edf500fecf..0573fe0e15 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=strace
 PKG_VERSION:=6.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION)
@@ -31,8 +31,6 @@ PKG_CONFIG_DEPENDS := \
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
-HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include
-
 CONFIGURE_VARS+= \
 	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 	CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
@@ -72,6 +70,7 @@ CONFIGURE_ARGS += \
 	--with-libdw=$(if $(CONFIG_STRACE_LIBDW),yes,no) \
 	--with-libunwind=$(if $(CONFIG_STRACE_LIBUNWIND),yes,no) \
 	--enable-mpers=no \
+	--enable-bundled=yes \
 	--without-libselinux
 
 MAKE_FLAGS := \




More information about the lede-commits mailing list