diff mbox

[2/2] Avoid undefined references with CONFIG_WPA_TRACE_BFD set

Message ID 1392839171-15481-2-git-send-email-roger.zanoni@openbossa.org
State Accepted
Headers show

Commit Message

Roger Zanoni Feb. 19, 2014, 7:46 p.m. UTC
libdl, libberty and libzlib are dependencies for libbfd.

Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>
---
 hostapd/Makefile        | 6 +++---
 wpa_supplicant/Makefile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Jouni Malinen Feb. 20, 2014, 2:28 p.m. UTC | #1
On Wed, Feb 19, 2014 at 03:46:11PM -0400, Roger Zanoni wrote:
> libdl, libberty and libzlib are dependencies for libbfd.

Thanks, applied. Was there supposed to be a patch 1/2 as well?

> diff --git a/hostapd/Makefile b/hostapd/Makefile
> @@ -78,9 +78,9 @@ LDFLAGS += -rdynamic
>  override CFLAGS += -funwind-tables
>  ifdef CONFIG_WPA_TRACE_BFD
>  override CFLAGS += -DPACKAGE="hostapd" -DWPA_TRACE_BFD
> -LIBS += -lbfd

These "override " parts for CFLAGS do not exist in hostap.git, so I'm
assuming something is missing before this patch. Anyway, I did apply
this as-is with those conflicts resolved manually.
Roger Zanoni Feb. 20, 2014, 2:54 p.m. UTC | #2
Yes, there's another patch, it got stuck because the message is too long:

Your mail to 'HostAP' with the subject

    [PATCH 1/2] Improve hostapd and wpa_supplicant CFLAGS handling

Is being held until the list moderator can review it for approval.

The reason it is being held:

    Message body is too big: 41323 bytes with a limit of 25 KB

I chaged all "CFLAGS +=..." to "override CFLAGS +=..." to allow passing a
CFLAGS variable through command line, without discarding assignments made
in makefile.
I don't knkow if this is the best approach, but I need something like this
to build hostapd and wpa_supplicant in my system (arch linux).

I can always edit the makefile and insert the search paths, but this patch
makes possible to inform them in the make command line.



2014-02-20 10:28 GMT-04:00 Jouni Malinen <j@w1.fi>:

> On Wed, Feb 19, 2014 at 03:46:11PM -0400, Roger Zanoni wrote:
> > libdl, libberty and libzlib are dependencies for libbfd.
>
> Thanks, applied. Was there supposed to be a patch 1/2 as well?
>
> > diff --git a/hostapd/Makefile b/hostapd/Makefile
> > @@ -78,9 +78,9 @@ LDFLAGS += -rdynamic
> >  override CFLAGS += -funwind-tables
> >  ifdef CONFIG_WPA_TRACE_BFD
> >  override CFLAGS += -DPACKAGE="hostapd" -DWPA_TRACE_BFD
> > -LIBS += -lbfd
>
> These "override " parts for CFLAGS do not exist in hostap.git, so I'm
> assuming something is missing before this patch. Anyway, I did apply
> this as-is with those conflicts resolved manually.
>
> --
> Jouni Malinen                                            PGP id EFC895FA
> _______________________________________________
> HostAP mailing list
> HostAP@lists.shmoo.com
> http://lists.shmoo.com/mailman/listinfo/hostap
>
diff mbox

Patch

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 385f865..251b3c9 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -78,9 +78,9 @@  LDFLAGS += -rdynamic
 override CFLAGS += -funwind-tables
 ifdef CONFIG_WPA_TRACE_BFD
 override CFLAGS += -DPACKAGE="hostapd" -DWPA_TRACE_BFD
-LIBS += -lbfd
-LIBS_c += -lbfd
-LIBS_h += -lbfd
+LIBS += -lbfd -ldl -liberty -lz
+LIBS_c += -lbfd -ldl -liberty -lz
+LIBS_h += -lbfd -ldl -liberty -lz
 endif
 endif
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 5ddc05f..fd8256d 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -107,9 +107,9 @@  LDFLAGS += -rdynamic
 override CFLAGS += -funwind-tables
 ifdef CONFIG_WPA_TRACE_BFD
 override CFLAGS += -DPACKAGE="wpa_supplicant" -DWPA_TRACE_BFD
-LIBS += -lbfd
-LIBS_p += -lbfd
-LIBS_c += -lbfd
+LIBS += -lbfd -ldl -liberty -lz
+LIBS_p += -lbfd -ldl -liberty -lz
+LIBS_c += -lbfd -ldl -liberty -lz
 endif
 endif