2022-06-21 20:38:13 +02:00
|
|
|
From c8270cea98bcce0d22ddc8e2f86eae2c9989efd4 Mon Sep 17 00:00:00 2001
|
2022-06-08 21:11:37 +02:00
|
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
|
Date: Fri, 25 Feb 2022 19:21:06 +0100
|
|
|
|
Subject: [PATCH] interface/vcos/pthreads/CMakeLists.txt: fix build with
|
|
|
|
libexecinfo
|
|
|
|
|
|
|
|
interface/vcos/glibc/vcos_backtrace.c uses execinfo.h which can be
|
|
|
|
provided by libexecinfo on uclibc or musl so link with it if needed to
|
|
|
|
avoid the following build failure:
|
|
|
|
|
|
|
|
/home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols'
|
|
|
|
|
|
|
|
Fixes:
|
|
|
|
- http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1
|
|
|
|
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
|
[Upstream status: https://github.com/raspberrypi/userland/pull/719]
|
|
|
|
---
|
|
|
|
interface/vcos/pthreads/CMakeLists.txt | 6 ++++--
|
|
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt
|
2022-06-21 20:38:13 +02:00
|
|
|
index 1d81ca3..100207f 100644
|
2022-06-08 21:11:37 +02:00
|
|
|
--- a/interface/vcos/pthreads/CMakeLists.txt
|
|
|
|
+++ b/interface/vcos/pthreads/CMakeLists.txt
|
|
|
|
@@ -33,12 +33,14 @@ set (SOURCES
|
|
|
|
../generic/vcos_generic_blockpool.c
|
|
|
|
)
|
|
|
|
|
|
|
|
+find_library (EXECINFO_LIBRARY execinfo)
|
|
|
|
+
|
|
|
|
if (VCOS_PTHREADS_BUILD_SHARED)
|
|
|
|
add_library (vcos SHARED ${SOURCES})
|
|
|
|
- target_link_libraries (vcos pthread dl rt)
|
2022-06-21 20:38:13 +02:00
|
|
|
+ target_link_libraries (vcos pthread dl rt $<$<BOOL:${EXECINFO_LIBRARY}>:${EXECINFO_LIBRARY}>)
|
2022-06-08 21:11:37 +02:00
|
|
|
else ()
|
|
|
|
add_library (vcos ${SOURCES})
|
|
|
|
- target_link_libraries (vcos pthread rt)
|
2022-06-21 20:38:13 +02:00
|
|
|
+ target_link_libraries (vcos pthread rt $<$<BOOL:${EXECINFO_LIBRARY}>:${EXECINFO_LIBRARY}>)
|
2022-06-08 21:11:37 +02:00
|
|
|
endif ()
|
|
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
2.35.1
|
|
|
|
|