Signed-off-by: Alexander Kanavin <[email protected]> --- ...97f8982544c4fcb403893bae6701230d5165.patch | 48 ------------------- .../libnl/{libnl_3.6.0.bb => libnl_3.7.0.bb} | 8 ++-- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch rename meta/recipes-support/libnl/{libnl_3.6.0.bb => libnl_3.7.0.bb} (91%)
diff --git a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch b/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch deleted file mode 100644 index 02662c939e..0000000000 --- a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fa7f97f8982544c4fcb403893bae6701230d5165 Mon Sep 17 00:00:00 2001 -From: Thomas Haller <[email protected]> -Date: Fri, 15 Apr 2022 13:29:49 +0200 -Subject: [PATCH] build: avoid building check-direct with --disable-static - -"check-direct" needs to statically link with the libraries, because -it wants to test internal ABI, which is hidden in the share libraries. -When configuring with "--disable-static", static libs are not build -and the test tool cannot be build. - -Just skip the test in that case. - -https://github.com/thom311/libnl/issues/306 -Upstream-Status: Backport [https://github.com/thom311/libnl/commit/fa7f97f8982544c4fcb403893bae6701230d5165] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - Makefile.am | 2 ++ - configure.ac | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index a6bcf553..2f5e0dfc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -984,8 +984,10 @@ tests_check_all_LDADD = \ - $(NULL) - - if WITH_CHECK -+if ENABLE_STATIC - check_programs += tests/check-direct - endif -+endif - - tests_check_direct_SOURCES = \ - tests/check-direct.c \ -diff --git a/configure.ac b/configure.ac -index 1f9ad0eb..0fd1cc0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,8 @@ else - AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required])) - fi - -+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"]) -+ - AC_ARG_ENABLE([debug], - AS_HELP_STRING([--disable-debug], [Do not include debugging statements]), - [enable_debug="$enableval"], [enable_debug="yes"]) diff --git a/meta/recipes-support/libnl/libnl_3.6.0.bb b/meta/recipes-support/libnl/libnl_3.7.0.bb similarity index 91% rename from meta/recipes-support/libnl/libnl_3.6.0.bb rename to meta/recipes-support/libnl/libnl_3.7.0.bb index af3aa41040..ddcc83a039 100644 --- a/meta/recipes-support/libnl/libnl_3.6.0.bb +++ b/meta/recipes-support/libnl/libnl_3.7.0.bb @@ -14,14 +14,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" -SRC_URI = " \ - https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ file://enable-serial-tests.patch \ file://run-ptest \ - file://fa7f97f8982544c4fcb403893bae6701230d5165.patch \ - " + " -SRC_URI[sha256sum] = "532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009" +SRC_URI[sha256sum] = "9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939" UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"; -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#168325): https://lists.openembedded.org/g/openembedded-core/message/168325 Mute This Topic: https://lists.openembedded.org/mt/92500560/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
