[openwrt/openwrt] iwinfo: build with nl80211 backend only and make shared
LEDE Commits
lede-commits at lists.infradead.org
Fri Jul 2 09:51:35 PDT 2021
jow pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/b0424190efe0fa4de4be6c1b59107e0881a39950
commit b0424190efe0fa4de4be6c1b59107e0881a39950
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri Jul 2 18:04:17 2021 +0200
iwinfo: build with nl80211 backend only and make shared
Drop support for building the obsolete broadcom-wl backend and always
forcibly enable the nl82011 support. This allows us to make the package
shared again since no target specific compilation is happening anymore.
This will solve various repository coherency issues related to unavailable
libiwinfo versions in the long run.
Signed-off-by: Jo-Philipp Wich <jo at mein.io>
(cherry picked from commit 5a1065758b88b568a04a50189400321601904bdf)
---
package/network/utils/iwinfo/Makefile | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
index d8c1befc97..b3ef261369 100644
--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
@@ -17,14 +17,6 @@ PKG_MIRROR_HASH:=24ad04791254a0523cd15a4fec6116d9ff121e006c93e5e41459f91347b33ec
PKG_MAINTAINER:=Jo-Philipp Wich <jo at mein.io>
PKG_LICENSE:=GPL-2.0
-PKG_FLAGS := nonshared
-
-PKG_CONFIG_DEPENDS := \
- CONFIG_PACKAGE_kmod-brcm-wl \
- CONFIG_PACKAGE_kmod-brcm-wl-mini \
- CONFIG_PACKAGE_kmod-brcm-wl-mimo \
- CONFIG_PACKAGE_kmod-cfg80211
-
IWINFO_ABI_VERSION:=20210430
include $(INCLUDE_DIR)/package.mk
@@ -34,13 +26,13 @@ define Package/libiwinfo
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Generalized Wireless Information Library (iwinfo)
- DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci +libubus
+ DEPENDS:=+libnl-tiny +libuci +libubus
ABI_VERSION:=$(IWINFO_ABI_VERSION)
endef
define Package/libiwinfo/description
- Wireless information library with consistent interface for proprietary Broadcom,
- nl80211 and wext driver interfaces.
+ Wireless information library with simplified API for nl80211
+ and wext driver interfaces.
endef
@@ -73,12 +65,6 @@ endef
define Build/Configure
endef
-IWINFO_BACKENDS := \
- $(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \
- $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mini),wl) \
- $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mimo),wl) \
- $(if $(CONFIG_PACKAGE_kmod-cfg80211),nl80211)
-
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include/libnl-tiny \
-I$(STAGING_DIR)/usr/include \
@@ -88,7 +74,7 @@ MAKE_FLAGS += \
FPIC="$(FPIC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
- BACKENDS="$(IWINFO_BACKENDS)" \
+ BACKENDS="nl80211" \
SOVERSION="$(IWINFO_ABI_VERSION)"
define Build/InstallDev
More information about the lede-commits
mailing list