blob: 7d5a0f099afa7a7f798d875d24c6e3b50741c1e5 [file] [log] [blame]
developer05f3b2b2024-08-19 19:17:34 +08001From aafc8ce9667fe00c16c3095cd3471d60a72fca0c Mon Sep 17 00:00:00 2001
developer66e89bc2024-04-23 14:50:01 +08002From: Hauke Mehrtens <hauke@hauke-m.de>
3Date: Sun, 21 Nov 2021 00:02:57 +0100
developer05f3b2b2024-08-19 19:17:34 +08004Subject: [PATCH 07/13] Revert "iw: allow specifying CFLAGS/LIBS externally"
developer66e89bc2024-04-23 14:50:01 +08005
6This reverts commit 1325244b77d56fd7a16d1e35fdae0efc151920b1.
7
8The OpenWrt build system provides the CFLAGS and LIBS names from the
9package Makefile to overwrite them for libnl-tiny. This is not possible
10after this upstream change which we revert here any more
11
12Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
13---
14 Makefile | 20 ++++++++++----------
15 1 file changed, 10 insertions(+), 10 deletions(-)
16
17diff --git a/Makefile b/Makefile
developer05f3b2b2024-08-19 19:17:34 +080018index 2652fac..07289a9 100644
developer66e89bc2024-04-23 14:50:01 +080019--- a/Makefile
20+++ b/Makefile
developer05f3b2b2024-08-19 19:17:34 +080021@@ -47,30 +47,30 @@ NLLIBNAME = libnl-1
developer66e89bc2024-04-23 14:50:01 +080022 endif
23
24 ifeq ($(NL2FOUND),Y)
25-override CFLAGS += -DCONFIG_LIBNL20
26-override LIBS += -lnl-genl
27+CFLAGS += -DCONFIG_LIBNL20
28+LIBS += -lnl-genl
29 NLLIBNAME = libnl-2.0
30 endif
31
32 ifeq ($(NL3xFOUND),Y)
33 # libnl 3.2 might be found as 3.2 and 3.0
34 NL3FOUND = N
35-override CFLAGS += -DCONFIG_LIBNL30
36-override LIBS += -lnl-genl-3
37+CFLAGS += -DCONFIG_LIBNL30
38+LIBS += -lnl-genl-3
39 NLLIBNAME = libnl-3.0
40 endif
41
42 ifeq ($(NL3FOUND),Y)
43-override CFLAGS += -DCONFIG_LIBNL30
44-override LIBS += -lnl-genl
45+CFLAGS += -DCONFIG_LIBNL30
46+LIBS += -lnl-genl
47 NLLIBNAME = libnl-3.0
48 endif
49
50 # nl-3.1 has a broken libnl-gnl-3.1.pc file
51 # as show by pkg-config --debug --libs --cflags --exact-version=3.1 libnl-genl-3.1;echo $?
52 ifeq ($(NL31FOUND),Y)
53-override CFLAGS += -DCONFIG_LIBNL30
54-override LIBS += -lnl-genl
55+CFLAGS += -DCONFIG_LIBNL30
56+LIBS += -lnl-genl
57 NLLIBNAME = libnl-3.1
58 endif
59
developer05f3b2b2024-08-19 19:17:34 +080060@@ -78,8 +78,8 @@ ifeq ($(NLLIBNAME),)
developer66e89bc2024-04-23 14:50:01 +080061 $(error Cannot find development files for any supported version of libnl)
62 endif
63
64-override LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
65-override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
66+LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
67+CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
68 endif # NO_PKG_CONFIG
69
70 ifeq ($(V),1)
71--
developer42c7a432024-07-12 14:39:29 +0800722.18.0
developer66e89bc2024-04-23 14:50:01 +080073