mirror of
https://git.freebsd.org/ports.git
synced 2025-07-13 15:29:15 -04:00
27ee37af56
Reviewed by: pizzamig (maintainer) Differential Revision: https://reviews.freebsd.org/D38759
37 lines
1.8 KiB
Text
37 lines
1.8 KiB
Text
commit a980a7d24b9ab416a70880182d4e6b4975967d38
|
|
Author: John Baldwin <jhb@FreeBSD.org>
|
|
Date: Fri Mar 10 12:01:40 2023 -0800
|
|
|
|
PR gdb/30214: Prefer local include paths to system include paths
|
|
|
|
Some systems may install binutils headers into a system location
|
|
(e.g. /usr/local/include on FreeBSD) which may also include headers
|
|
for other external packages used by GDB such as zlib or zstd. If a
|
|
system include path such as /usr/local/include is added before local
|
|
include paths to directories within a clone or release tarball, then
|
|
headers from the external binutils package are used which can result
|
|
in build failures if the external binutils package is out of sync with
|
|
the version of GDB being built.
|
|
|
|
To fix, sort the include paths in INTERNAL_CFLAGS_BASE to add CFLAGS
|
|
for "local" componenets before external components.
|
|
|
|
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30214
|
|
Reviewed-By: Tom Tromey <tom@tromey.com>
|
|
(cherry picked from commit a2fbb6903889c8fe32f4f3b890ef4b8c565d6b84)
|
|
|
|
diff --git gdb/Makefile.in gdb/Makefile.in
|
|
index 321a58c4635..fa7c81a0fab 100644
|
|
--- gdb/Makefile.in
|
|
+++ gdb/Makefile.in
|
|
@@ -629,8 +629,8 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
|
|
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
|
|
INTERNAL_CFLAGS_BASE = \
|
|
$(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
|
|
- $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \
|
|
- $(ZSTD_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
|
|
+ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) \
|
|
+ $(READLINE_CFLAGS) $(ZLIBINC) $(ZSTD_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
|
|
$(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(LIBBACKTRACE_INC) \
|
|
$(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) \
|
|
$(TOP_CFLAGS) $(PTHREAD_CFLAGS) $(DEBUGINFOD_CFLAGS)
|