mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/wireshark: fix build failure with -latomic

Browse Source 
Fix the following build failure raised since bump to version 3.4.10 in
commit 0ce776942d:

/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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2021-12-01 23:11:14 +01:00
committed by Peter Korsgaard
parent 43e36f3acd
commit 76e66240da
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
package/wireshark/0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch → package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch
View File

@@ -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 <fontaine.fabrice@gmail.com> From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 26 Nov 2021 17:45:23 +0100 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 Wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} when LEMON_C_COMPILER is set to
when cross-compiling (e.g. with buildroot) avoid a build failure when cross-compiling (e.g. with buildroot)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: [Upstream status:
https://gitlab.com/wireshark/wireshark/-/merge_requests/5224] https://gitlab.com/wireshark/wireshark/-/merge_requests/5224]
--- ---
tools/lemon/CMakeLists.txt | 1 + tools/lemon/CMakeLists.txt | 2 ++
1 file changed, 1 insertion(+) 1 file changed, 2 insertions(+)
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt 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 --- a/tools/lemon/CMakeLists.txt
+++ b/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) if(DEFINED LEMON_C_COMPILER)
set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}") set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}")
set(CMAKE_C_FLAGS "") set(CMAKE_C_FLAGS "")
+ set(CMAKE_EXE_LINKER_FLAGS "")
+ set(CMAKE_SYSROOT "") + set(CMAKE_SYSROOT "")
endif() endif()