From 76e66240da9b5dac8177fca4deb0f66c3c994023 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 Dec 2021 23:11:14 +0100 Subject: [PATCH] package/wireshark: fix build failure with -latomic Fix the following build failure raised since bump to version 3.4.10 in commit 0ce776942d34d5d3bea6c11913cac38ea3e52f8b: /usr/bin/ld: cannot find /usr/lib64/libatomic.so.1.0.0 collect2: error: ld returned 1 exit status make[3]: *** [run/lemon] Error 1 Fixes: - http://autobuild.buildroot.org/results/02ea7d76a683b039fb37e005578644108bd1e3b7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...e-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch} | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) rename package/wireshark/{0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch => 0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch} (56%) diff --git a/package/wireshark/0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch b/package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch similarity index 56% rename from package/wireshark/0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch rename to package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch index 51875fd267..edf24fc6d0 100644 --- a/package/wireshark/0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch +++ b/package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch @@ -1,26 +1,27 @@ -From 982e5ab072816e29f6f2dc84d9a00ee7c4fdee40 Mon Sep 17 00:00:00 2001 +From 33270f56477542dedf978e660cf8d08464f28797 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Nov 2021 17:45:23 +0100 -Subject: [PATCH] cmake: lemon: wipe CMAKE_SYSROOT if needed +Subject: [PATCH] cmake: lemon: wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} if needed -Wipe CMAKE_SYSROOT when LEMON_C_COMPILER is set to avoid a build failure -when cross-compiling (e.g. with buildroot) +Wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} when LEMON_C_COMPILER is set to +avoid a build failure when cross-compiling (e.g. with buildroot) Signed-off-by: Fabrice Fontaine [Upstream status: https://gitlab.com/wireshark/wireshark/-/merge_requests/5224] --- - tools/lemon/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) + tools/lemon/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt -index 8742aa9fc9..7c8cc23a35 100644 +index 8742aa9fc9..7a9263fe0d 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt -@@ -12,6 +12,7 @@ add_executable(lemon lemon.c) +@@ -12,6 +12,8 @@ add_executable(lemon lemon.c) if(DEFINED LEMON_C_COMPILER) set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}") set(CMAKE_C_FLAGS "") ++ set(CMAKE_EXE_LINKER_FLAGS "") + set(CMAKE_SYSROOT "") endif()