From: Mark Wielaard <mark@klomp.org>
Date: Thu, 26 Jun 2025 14:20:41 +0000 (+0200)
Subject: src: Make sure to include local elfutils headers, not system headers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fusers%2Fmark%2Ftry-src-include-update;p=thirdparty%2Felfutils.git

src: Make sure to include local elfutils headers, not system headers

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/libdw/dwarf_srclang.c b/libdw/dwarf_srclang.c
index 10dfce8b..990588db 100644
--- a/libdw/dwarf_srclang.c
+++ b/libdw/dwarf_srclang.c
@@ -32,7 +32,7 @@
 # include <config.h>
 #endif
 
-#include <dwarf.h>
+#include "dwarf.h"
 #include "libdwP.h"
 
 
diff --git a/src/addr2line.c b/src/addr2line.c
index d87e5b45..6420e816 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -26,8 +26,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libdwfl.h>
-#include <dwarf.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -39,6 +37,8 @@
 #include <system.h>
 #include <printversion.h>
 
+#include "libdwfl.h"
+#include "dwarf.h"
 
 /* Name and version of program.  */
 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
diff --git a/src/ar.c b/src/ar.c
index 03118c4e..ded72854 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -23,7 +23,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <limits.h>
 #include <locale.h>
 #include <search.h>
@@ -41,6 +40,7 @@
 #include <system.h>
 #include <printversion.h>
 
+#include "gelf.h"
 #include "libeu.h"
 #include "arlib.h"
 
diff --git a/src/arlib.c b/src/arlib.c
index b8f89ba7..02c02232 100644
--- a/src/arlib.c
+++ b/src/arlib.c
@@ -21,13 +21,13 @@
 #endif
 
 #include <assert.h>
-#include <gelf.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
-#include <libeu.h>
+#include "gelf.h"
+#include "libeu.h"
 
 #include "system.h"
 #include "arlib.h"
diff --git a/src/arlib.h b/src/arlib.h
index d4a42210..b12301b1 100644
--- a/src/arlib.h
+++ b/src/arlib.h
@@ -22,13 +22,13 @@
 #include <argp.h>
 #include <byteswap.h>
 #include <endian.h>
-#include <libelf.h>
 #include <obstack.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "libelf.h"
 
 /* State of -D/-U flags.  */
 extern bool arlib_deterministic_output;
diff --git a/src/elfclassify.c b/src/elfclassify.c
index 25fe9a65..d278d4e2 100644
--- a/src/elfclassify.c
+++ b/src/elfclassify.c
@@ -20,7 +20,6 @@
 
 #include <argp.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -29,8 +28,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include ELFUTILS_HEADER(elf)
-#include ELFUTILS_HEADER(dwelf)
+#include "libelf.h"
+#include "libdwelf.h"
+#include "gelf.h"
 #include "printversion.h"
 
 /* Name and version of program.  */
diff --git a/src/elfcompress.c b/src/elfcompress.c
index f771b92a..bfeedfe1 100644
--- a/src/elfcompress.c
+++ b/src/elfcompress.c
@@ -29,10 +29,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include ELFUTILS_HEADER(elf)
-#include ELFUTILS_HEADER(ebl)
-#include ELFUTILS_HEADER(dwelf)
-#include <gelf.h>
+
+#include "libelf.h"
+#include "libebl.h"
+#include "libdwelf.h"
+#include "gelf.h"
 #include "system.h"
 #include "libeu.h"
 #include "printversion.h"
diff --git a/src/elflint.c b/src/elflint.c
index a46682c7..ea291f9b 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -26,7 +26,6 @@
 #include <byteswap.h>
 #include <endian.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <inttypes.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -35,8 +34,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <elf-knowledge.h>
-#include <libeu.h>
+#include "gelf.h"
+#include "elf-knowledge.h"
+#include "libeu.h"
 #include <system.h>
 #include <printversion.h>
 #include "../libelf/libelfP.h"
diff --git a/src/findtextrel.c b/src/findtextrel.c
index d3021a3a..e42f4d2e 100644
--- a/src/findtextrel.c
+++ b/src/findtextrel.c
@@ -24,8 +24,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gelf.h>
-#include <libdw.h>
 #include <locale.h>
 #include <search.h>
 #include <stdbool.h>
@@ -37,6 +35,8 @@
 #include <printversion.h>
 #include "libeu.h"
 #include "system.h"
+#include "gelf.h"
+#include "libdw.h"
 
 struct segments
 {
diff --git a/src/nm.c b/src/nm.c
index 40b192f6..33018997 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -24,12 +24,9 @@
 #include <argp.h>
 #include <assert.h>
 #include <ctype.h>
-#include <dwarf.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <inttypes.h>
-#include <libdw.h>
 #include <locale.h>
 #include <obstack.h>
 #include <search.h>
@@ -44,6 +41,10 @@
 #include <system.h>
 #include <color.h>
 #include <printversion.h>
+
+#include "dwarf.h"
+#include "gelf.h"
+#include "libdw.h"
 #include "../libebl/libeblP.h"
 #include "../libdwfl/libdwflP.h"
 
diff --git a/src/ranlib.c b/src/ranlib.c
index 073df8c5..9c66d3d4 100644
--- a/src/ranlib.c
+++ b/src/ranlib.c
@@ -25,7 +25,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <locale.h>
 #include <obstack.h>
 #include <stdlib.h>
@@ -38,6 +37,7 @@
 #include <system.h>
 #include <printversion.h>
 
+#include "gelf.h"
 #include "arlib.h"
 
 
diff --git a/src/readelf.c b/src/readelf.c
index b7dba390..222afdd6 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -23,14 +23,10 @@
 #include <argp.h>
 #include <assert.h>
 #include <ctype.h>
-#include <dwarf.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <inttypes.h>
 #include <langinfo.h>
-#include <libdw.h>
-#include <libdwfl.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -47,6 +43,11 @@
 #include <libeu.h>
 #include <system.h>
 #include <printversion.h>
+
+#include "dwarf.h"
+#include "gelf.h"
+#include "libdw.h"
+#include "libdwfl.h"
 #include "../libelf/libelfP.h"
 #include "../libelf/common.h"
 #include "../libebl/libeblP.h"
diff --git a/src/size.c b/src/size.c
index 2985bc09..64e8cd40 100644
--- a/src/size.c
+++ b/src/size.c
@@ -22,9 +22,7 @@
 
 #include <argp.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <inttypes.h>
-#include <libelf.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -36,6 +34,9 @@
 #include <system.h>
 #include <printversion.h>
 
+#include "gelf.h"
+#include "libelf.h"
+
 /* Name and version of program.  */
 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
 
diff --git a/src/srcfiles.cxx b/src/srcfiles.cxx
index c36a7034..dcefeffd 100644
--- a/src/srcfiles.cxx
+++ b/src/srcfiles.cxx
@@ -32,26 +32,27 @@
 #endif
 
 #include "printversion.h"
-#include <dwarf.h>
 #include <argp.h>
 #include <cstring>
 #include <set>
 #include <string>
 #include <cassert>
-#include <gelf.h>
 #include <memory>
 
 #ifdef ENABLE_LIBDEBUGINFOD
 #include "debuginfod.h"
 #endif
 
-#include <libdwfl.h>
 #include <fcntl.h>
 #include <iostream>
-#include <libdw.h>
 #include <sstream>
 #include <vector>
 
+#include "dwarf.h"
+#include "gelf.h"
+#include "libdw.h"
+#include "libdwfl.h"
+
 /* Libraries for use by the --zip option */
 #ifdef HAVE_LIBARCHIVE
 #include <archive.h>
diff --git a/src/stack.c b/src/stack.c
index a06cb077..c67de578 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -25,12 +25,13 @@
 #include <string.h>
 #include <locale.h>
 #include <fcntl.h>
-#include ELFUTILS_HEADER(dwfl)
 
-#include <dwarf.h>
 #include <system.h>
 #include <printversion.h>
 
+#include "libdwfl.h"
+#include "dwarf.h"
+
 /* Name and version of program.  */
 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
 
diff --git a/src/strings.c b/src/strings.c
index fe0f3a48..590ef5a9 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -26,7 +26,6 @@
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gelf.h>
 #include <inttypes.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -38,10 +37,12 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include <libeu.h>
 #include <system.h>
 #include <printversion.h>
 
+#include "gelf.h"
+#include "libeu.h"
+
 #ifndef MAP_POPULATE
 # define MAP_POPULATE 0
 #endif
diff --git a/src/strip.c b/src/strip.c
index 8d2bb7a9..70870167 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -26,8 +26,6 @@
 #include <endian.h>
 #include <fcntl.h>
 #include <fnmatch.h>
-#include <gelf.h>
-#include <libelf.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -38,10 +36,13 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include <elf-knowledge.h>
-#include <libebl.h>
+#include "gelf.h"
+#include "libelf.h"
+#include "elf-knowledge.h"
+#include "libebl.h"
 #include "libdwelf.h"
-#include <libeu.h>
+#include "libeu.h"
+
 #include <system.h>
 #include <printversion.h>
 
diff --git a/src/unstrip.c b/src/unstrip.c
index 6c2a98ef..978904c5 100644
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -43,9 +43,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <gelf.h>
-#include <libebl.h>
-#include <libdwfl.h>
+#include "gelf.h"
+#include "libebl.h"
+#include "libdwfl.h"
 #include "system.h"
 #include "libdwelf.h"
 #include "libeu.h"