diff mbox series

[meta-oe,91/96] libabigail: Fix host include path use in configure

Message ID 20261115074918.2932593-91-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,01/96] crow: upgrade 1.3.4 -> 1.3.5 | expand

Commit Message

Khem Raj Nov. 15, 2026, 7:49 a.m. UTC
configure in 3.0 adds -I$EU_INCLUDEDIR (pkg-config --variable, not
sysroot-prefixed) and -I${prefix}/include to CPPFLAGS for the elfutils
header checks, i.e. -I/usr/include when cross compiling. This triggers
the configure-unsafe QA error with gcc, and makes the
_ELFUTILS_THREAD_SAFE check read the build host's elfutils/version.h.

Use the pkg-config ELF_CFLAGS/DW_CFLAGS instead.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...g-config-cflags-for-elfutils-header-.patch | 68 +++++++++++++++++++
 .../libabigail/libabigail_3.0.bb              |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/libabigail/libabigail/0002-configure-Use-pkg-config-cflags-for-elfutils-header-.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/libabigail/libabigail/0002-configure-Use-pkg-config-cflags-for-elfutils-header-.patch b/meta-oe/recipes-devtools/libabigail/libabigail/0002-configure-Use-pkg-config-cflags-for-elfutils-header-.patch
new file mode 100644
index 0000000000..ebdc340118
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail/0002-configure-Use-pkg-config-cflags-for-elfutils-header-.patch
@@ -0,0 +1,68 @@ 
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sat, 14 Nov 2026 00:06:03 -0800
+Subject: [PATCH] configure: Use pkg-config cflags for elfutils header checks
+
+The elfutils header/declaration checks prepend -I$EU_INCLUDEDIR and
+-I${prefix}/include to CPPFLAGS.  EU_INCLUDEDIR comes from
+"pkg-config --variable=includedir", which is not prefixed with the
+sysroot, so both expand to -I/usr/include when cross compiling and the
+checks look at the build host headers instead of the target sysroot.
+
+Use $ELF_CFLAGS and $DW_CFLAGS from PKG_CHECK_MODULES instead.  These
+already point at the elfutils found via --with-elfutils or
+PKG_CONFIG_PATH, and pkg-config applies PKG_CONFIG_SYSROOT_DIR to them.
+
+	* configure.ac: Use $ELF_CFLAGS $DW_CFLAGS rather than
+	-I$EU_INCLUDEDIR and -I${prefix}/include when checking for
+	elfutils headers and declarations.
+
+Upstream-Status: Submitted [https://inbox.sourceware.org/libabigail/20261114080604.2989291-1-khem.raj@oss.qualcomm.com/]
+
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ configure.ac | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a8509d7a..64fef76f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1105,7 +1105,7 @@ dnl By default, look for elfutils in the default system prefix.
+ if test x$ENABLE_MULTITHREADING != xno; then
+    saved_CPPFLAGS="$CPPFLAGS"
+
+-   CPPFLAGS="-I$EU_INCLUDEDIR $CPPFLAGS"
++   CPPFLAGS="$ELF_CFLAGS $DW_CFLAGS $CPPFLAGS"
+    AC_CHECK_HEADER([elfutils/version.h],
+ 		   [HAS_ELFUTILS_VERSION=yes],
+ 		   [AC_MSG_NOTICE([could not find elfutils/version.h])])
+@@ -1210,15 +1210,8 @@ AM_CONDITIONAL([CTF_READER],[test "x$ENABLE_CTF" = "xyes"])
+ AM_CONDITIONAL([BTF_READER],[test "x$ENABLE_BTF" = "xyes"])
+ AM_CONDITIONAL([ENABLE_LIBABIGAIL_MULTITHREADING],[test "x$ENABLE_MULTITHREADING" = "xyes"])
+
+-use_prefixed_includedir=""
+-if test x$prefix != x; then
+-  use_prefixed_includedir=$prefix
+-fi
+-
+-if test x$use_prefixed_includedir != x; then
+-  saved_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="-I${prefix}/include $CPPFLAGS"
+-fi
++saved_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$ELF_CFLAGS $DW_CFLAGS $CPPFLAGS"
+
+ dnl Check if several decls and constant are defined in dependant
+ dnl libraries
+@@ -1796,9 +1789,7 @@ if test x$HAS_DW_FORM_strx1 = xyes -a \
+ 	     [Define to 1 if dwarf.h has the DW_FORM_strx enumerators])
+ fi
+
+-if test x$use_prefixed_includedir != x; then
+-  CPPFLAGS="$saved_CPPFLAGS"
+-fi
++CPPFLAGS="$saved_CPPFLAGS"
+
+
+ dnl Set large files support
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_3.0.bb b/meta-oe/recipes-devtools/libabigail/libabigail_3.0.bb
index 9dbecacf79..ebae94f5d7 100644
--- a/meta-oe/recipes-devtools/libabigail/libabigail_3.0.bb
+++ b/meta-oe/recipes-devtools/libabigail/libabigail_3.0.bb
@@ -6,6 +6,7 @@  LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"

 SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \
            file://0001-Link-tools-with-argp-standalone-when-the-C-library-l.patch \
+           file://0002-configure-Use-pkg-config-cflags-for-elfutils-header-.patch \
            "
 SRC_URI[sha256sum] = "d34ea7c4b150f61e22edb1d16157e12c43fd18f8e8f09abce053d82ccaf92e06"