btfilter: fix build with libnl-3
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
ff37a3272d
commit
cacf212fc4
|
|
@ -4,16 +4,16 @@ Subject: [PATCH] enable-libnl3
|
|||
|
||||
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||
---
|
||||
Makefile | 8 +++++++-
|
||||
Makefile | 7 ++++++-
|
||||
nl80211_utils.c | 4 ++--
|
||||
nl80211_utils.h | 2 +-
|
||||
3 files changed, 10 insertions(+), 4 deletions(-)
|
||||
3 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 115ad33..3170f65 100644
|
||||
index 115ad33..6c21413 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -56,17 +56,23 @@ LIBS= -ldbus-1 -lpthread -lrt -lbluetooth
|
||||
@@ -56,17 +56,22 @@ LIBS= -ldbus-1 -lpthread -lrt -lbluetooth
|
||||
|
||||
NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
|
||||
NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
|
||||
|
|
@ -31,7 +31,6 @@ index 115ad33..3170f65 100644
|
|||
endif
|
||||
|
||||
+ifeq ($(NL3FOUND),Y)
|
||||
+LIBS += -lnl-genl
|
||||
+NLLIBNAME = libnl-3.0
|
||||
+endif
|
||||
+
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
|||
1 file changed, 27 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3170f65..22137d7 100644
|
||||
index 6c21413..91659dd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -25,13 +25,13 @@ SBINDIR ?= $(PREFIX)/sbin
|
||||
|
|
@ -61,7 +61,7 @@ index 3170f65..22137d7 100644
|
|||
|
||||
NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
|
||||
NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
|
||||
@@ -80,6 +80,13 @@ endif
|
||||
@@ -79,6 +79,13 @@ endif
|
||||
LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ index 3170f65..22137d7 100644
|
|||
|
||||
ifdef BOARD_HAS_ATH_WLAN_AR6004
|
||||
CFLAGS += -DMULTI_WLAN_CHAN_SUPPORT
|
||||
@@ -125,3 +132,7 @@ all: $(OBJECTS)
|
||||
@@ -124,3 +131,7 @@ all: $(OBJECTS)
|
||||
|
||||
clean:
|
||||
rm -f $(FILTERAPP) $(OBJECTS)
|
||||
|
|
|
|||
Loading…
Reference in New Issue