mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
package/iwd: bump version to 1.12
- remove 0001-configure.ac-fix-static-build-with-readline.patch
(upstream [1])
[1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=62d31539d6e31a40d7d33c73637e37b50c59ef40
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 542097b11a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
027a12de4d
commit
4b5947b05b
@@ -1,61 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Locally computed
|
# Locally computed
|
||||||
sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz
|
sha256 c0d827f446012cd14e63d174d52b69b0806ae23f0708933d50c57fea64af9c8a iwd-1.12-br1.tar.gz
|
||||||
|
|
||||||
# License files
|
# License files
|
||||||
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
|
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
IWD_VERSION = 1.10
|
IWD_VERSION = 1.12
|
||||||
IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
|
IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
|
||||||
IWD_SITE_METHOD = git
|
IWD_SITE_METHOD = git
|
||||||
IWD_LICENSE = LGPL-2.1+
|
IWD_LICENSE = LGPL-2.1+
|
||||||
|
|||||||
Reference in New Issue
Block a user