forked from mirror/openwrt
b64fdedeac
Changelog: a52bda0 (HEAD, tag: v6.17) bump version to 6.17 c5bfa2a iw: add support to print link level information in station dump efaf786 iw: Add support to set per-radio RTS threshold in multi-radio wiphy 009ad3b update nl80211.h aef3798 iw: don't set stupid socket buffer size 8d52fb4 iw: scan: Add partial Multi-Link element printing cfc0695 iw: print HE mcs correctly when mcs_len 8e4808f iw: Add command to enable/disable EPCS 85b79b3 update nl80211.h 612f9f5 iw: Prevent segfault in ftm get stats 1558e60 iw: print NO-EHT flags for reg get command 59660a3 iw: fix EHT capabilities on Big Endian platforms 8ea80d3 iw: scan: Add printing of EHT Operation Element 7c0511b util: rename hz to Hz vol 2 c2a12a5 util: rename hz to Hz 0cc98ae iw: scan: Decode additional WPA3 group ciphers f04e5c5 iw: scan: Decode additional WPA3 AKM suite types 41a07a8 iw: fix HE operation on Big Endian platforms c41971e iw: fix HE capabilities on Big Endian platforms a6ad3f1 iw: scan: add eht capability parsing 4c85991 iw: util: update and clean up eht capa printing a0a7dde iw: scan: replace passed ie buffer with ie context 7bc2a84 iw: print tx power per link for MLD 478ddd4 iw: add output for wiphy interface combinations 93e2309 update nl80211.h 966c590 iw: scan: add enum for element IDs 422419e scan: Add printing of HE Operation Element d088c8a update nl80211.h 73231dd iw: fix formats under MIPS64/PPC 8609336 iw: remove sizer section and related code c8b9e77 util: clarify comment about 'parsed' pointer b29da20 iw: add puncturing support cce9897 iw: refactor frequency help Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Link: https://github.com/openwrt/openwrt/pull/20321 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
From 1f3706d10812d70adefe32fe0d7d3a3ec25374f0 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 21 Nov 2021 00:02:57 +0100
|
|
Subject: Revert "iw: allow specifying CFLAGS/LIBS externally"
|
|
|
|
This reverts commit 1325244b77d56fd7a16d1e35fdae0efc151920b1.
|
|
|
|
The OpenWrt build system provides the CFLAGS and LIBS names from the
|
|
package Makefile to overwrite them for libnl-tiny. This is not possible
|
|
after this upstream change which we revert here any more
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
Makefile | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -47,30 +47,30 @@ NLLIBNAME = libnl-1
|
|
endif
|
|
|
|
ifeq ($(NL2FOUND),Y)
|
|
-override CFLAGS += -DCONFIG_LIBNL20
|
|
-override LIBS += -lnl-genl
|
|
+CFLAGS += -DCONFIG_LIBNL20
|
|
+LIBS += -lnl-genl
|
|
NLLIBNAME = libnl-2.0
|
|
endif
|
|
|
|
ifeq ($(NL3xFOUND),Y)
|
|
# libnl 3.2 might be found as 3.2 and 3.0
|
|
NL3FOUND = N
|
|
-override CFLAGS += -DCONFIG_LIBNL30
|
|
-override LIBS += -lnl-genl-3
|
|
+CFLAGS += -DCONFIG_LIBNL30
|
|
+LIBS += -lnl-genl-3
|
|
NLLIBNAME = libnl-3.0
|
|
endif
|
|
|
|
ifeq ($(NL3FOUND),Y)
|
|
-override CFLAGS += -DCONFIG_LIBNL30
|
|
-override LIBS += -lnl-genl
|
|
+CFLAGS += -DCONFIG_LIBNL30
|
|
+LIBS += -lnl-genl
|
|
NLLIBNAME = libnl-3.0
|
|
endif
|
|
|
|
# nl-3.1 has a broken libnl-gnl-3.1.pc file
|
|
# as show by pkg-config --debug --libs --cflags --exact-version=3.1 libnl-genl-3.1;echo $?
|
|
ifeq ($(NL31FOUND),Y)
|
|
-override CFLAGS += -DCONFIG_LIBNL30
|
|
-override LIBS += -lnl-genl
|
|
+CFLAGS += -DCONFIG_LIBNL30
|
|
+LIBS += -lnl-genl
|
|
NLLIBNAME = libnl-3.1
|
|
endif
|
|
|
|
@@ -78,8 +78,8 @@ ifeq ($(NLLIBNAME),)
|
|
$(error Cannot find development files for any supported version of libnl)
|
|
endif
|
|
|
|
-override LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
|
|
-override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
|
|
+LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
|
|
+CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
|
|
endif # NO_PKG_CONFIG
|
|
|
|
ifeq ($(V),1)
|