Fix hostapd and wpa_supplicant build with binutils >= 2.24.x

Using binutils >= 2.24.x and setting
CONFIG_WPA_TRACE/CONFIG_WPA_TRACE_BDF causes both builds to fail with
"#error config.h must be included before this header" message.

Since version 2.24.x, the bfd header checks for PACKAGE and
PACKAGE_VERSION macros.

As suggested in http://sourceware.org/bugzilla/show_bug.cgi?id=14243
projects that use bfd and don't use autotools should define a PACKAGE
macro.

Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>

diff --git a/hostapd/Makefile b/hostapd/Makefile
index ef093e5bf0ea343904a8bf1bf1d6a97014620b4a..d7ff91e147d22d56a0d799fdbd789fc1fef48347 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -77,7 +77,7 @@ HOBJS += ../src/utils/trace.o
 LDFLAGS += -rdynamic
 CFLAGS += -funwind-tables
 ifdef CONFIG_WPA_TRACE_BFD
-CFLAGS += -DWPA_TRACE_BFD
+CFLAGS += -DPACKAGE="hostapd" -DWPA_TRACE_BFD
 LIBS += -lbfd
 LIBS_c += -lbfd
 LIBS_h += -lbfd

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index d1e11a3ee051a351cd75867769c2899d3ecb253b..496f6fbca69c74d3fbe736bb5ad26e0d0edc9f0f 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -106,7 +106,7 @@ OBJS_priv += ../src/utils/trace.o
 LDFLAGS += -rdynamic
 CFLAGS += -funwind-tables
 ifdef CONFIG_WPA_TRACE_BFD
-CFLAGS += -DWPA_TRACE_BFD
+CFLAGS += -DPACKAGE="wpa_supplicant" -DWPA_TRACE_BFD
 LIBS += -lbfd
 LIBS_p += -lbfd
 LIBS_c += -lbfd