summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:04:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:37 +0100
commitbf6c6623612d2712e5f99818f0f5ed8905bc90cc (patch)
treeeae18ff673c97fb901588a8a9975f4b984f65ba5 /meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch
parent3d2a3d92fe3e2091af6474b95dd16bac8a63ea42 (diff)
downloadpoky-bf6c6623612d2712e5f99818f0f5ed8905bc90cc.tar.gz
libnl: upgrade 3.5.0 -> 3.6.0
(From OE-Core rev: 09bdeeabf03b6ca1c5410dc7573571554cf172ce) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch')
-rw-r--r--meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch b/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch
new file mode 100644
index 0000000000..02662c939e
--- /dev/null
+++ b/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch
@@ -0,0 +1,48 @@
1From fa7f97f8982544c4fcb403893bae6701230d5165 Mon Sep 17 00:00:00 2001
2From: Thomas Haller <thaller@redhat.com>
3Date: Fri, 15 Apr 2022 13:29:49 +0200
4Subject: [PATCH] build: avoid building check-direct with --disable-static
5
6"check-direct" needs to statically link with the libraries, because
7it wants to test internal ABI, which is hidden in the share libraries.
8When configuring with "--disable-static", static libs are not build
9and the test tool cannot be build.
10
11Just skip the test in that case.
12
13https://github.com/thom311/libnl/issues/306
14Upstream-Status: Backport [https://github.com/thom311/libnl/commit/fa7f97f8982544c4fcb403893bae6701230d5165]
15Signed-off-by: Alexander Kanavin <alex@linutronix.de>
16---
17 Makefile.am | 2 ++
18 configure.ac | 2 ++
19 2 files changed, 4 insertions(+)
20
21diff --git a/Makefile.am b/Makefile.am
22index a6bcf553..2f5e0dfc 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -984,8 +984,10 @@ tests_check_all_LDADD = \
26 $(NULL)
27
28 if WITH_CHECK
29+if ENABLE_STATIC
30 check_programs += tests/check-direct
31 endif
32+endif
33
34 tests_check_direct_SOURCES = \
35 tests/check-direct.c \
36diff --git a/configure.ac b/configure.ac
37index 1f9ad0eb..0fd1cc0f 100644
38--- a/configure.ac
39+++ b/configure.ac
40@@ -107,6 +107,8 @@ else
41 AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required]))
42 fi
43
44+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"])
45+
46 AC_ARG_ENABLE([debug],
47 AS_HELP_STRING([--disable-debug], [Do not include debugging statements]),
48 [enable_debug="$enableval"], [enable_debug="yes"])