diff options
Diffstat (limited to 'package/iwd')
| -rw-r--r-- | package/iwd/0001-configure.ac-fix-static-build-with-readline.patch | 61 | ||||
| -rw-r--r-- | package/iwd/Config.in | 7 | ||||
| -rw-r--r-- | package/iwd/iwd.hash | 2 | ||||
| -rw-r--r-- | package/iwd/iwd.mk | 5 |
4 files changed, 69 insertions, 6 deletions
diff --git a/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch b/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch new file mode 100644 index 0000000000..37dbdb18e5 --- /dev/null +++ b/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch @@ -0,0 +1,61 @@ +From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Wed, 16 Dec 2020 07:51:04 +0100 +Subject: [PATCH] configure.ac: fix static build with readline + +Retrieve the dependencies of readline through pkg-config (and fallback +to -lreadline) to avoid the following build failure: + +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr': +display.c:(.text+0x1ab): undefined reference to `tputs' + +Fixes: + - http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd@lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/] +--- + Makefile.am | 4 ++-- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3cd7eaa6..493d06cc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \ + client/network.h client/network.c \ + client/properties.h client/properties.c \ + client/wsc.c client/station.c +-client_iwctl_LDADD = $(ell_ldadd) -lreadline ++client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS) + + if MANUAL_PAGES + man_MANS += client/iwctl.1 +@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \ + client/display.h client/display.c \ + client/network.h client/network.c \ + client/properties.h client/properties.c +-unit_test_client_LDADD = $(ell_ldadd) -lreadline ++unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS) + endif + + unit_test_sae_SOURCES = unit/test-sae.c \ +diff --git a/configure.ac b/configure.ac +index 7bd917a4..52f27ed9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], + if (test "${enable_client}" != "no"); then + AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, + AC_MSG_ERROR(readline header files are required)) ++ PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline) ++ AC_SUBST(READLINE_CFLAGS) ++ AC_SUBST(READLINE_LIBS) + fi + AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") + +-- +2.29.2 + diff --git a/package/iwd/Config.in b/package/iwd/Config.in index 4e85fb4fd7..59d4422305 100644 --- a/package/iwd/Config.in +++ b/package/iwd/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_IWD depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell - depends on !BR2_STATIC_LIBS # ell depends on BR2_USE_WCHAR # ell select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_ELL @@ -14,8 +13,8 @@ config BR2_PACKAGE_IWD https://iwd.wiki.kernel.org/ -comment "iwd needs a toolchain w/ threads, dynamic library, wchar, headers >= 4.12" +comment "iwd needs a toolchain w/ threads, wchar, headers >= 4.12" depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 16e01ed473..f1ee23dc5d 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e4178a105021ef1b7b7c23cbc6f8e45cbab3bb0830da588b406ff4a281e9f948 iwd-1.9.tar.gz +sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 58d332dc07..652beb838f 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,13 +4,16 @@ # ################################################################################ -IWD_VERSION = 1.9 +IWD_VERSION = 1.10 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+ IWD_LICENSE_FILES = COPYING +IWD_CPE_ID_VENDOR = intel +IWD_CPE_ID_PRODUCT = inet_wireless_daemon # sources from git, no configure script provided IWD_AUTORECONF = YES +IWD_SELINUX_MODULES = networkmanager IWD_CONF_OPTS = \ --disable-manual-pages \ |