summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <bero@baylibre.com>2022-10-27 21:47:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-14 15:59:15 +0000
commite65081b94914b1c82d3c6dc41aea2fb6fec35466 (patch)
treeb9524cf2cbf3ad22dfb164fe4d5a9fa2a268b6ba /meta
parent027ec0ecf547a447736a7b9ce012473c8c8fa765 (diff)
downloadpoky-e65081b94914b1c82d3c6dc41aea2fb6fec35466.tar.gz
cmake-native: Fix host tool contamination
[v2 hopefully fixes the From: mangling by the ML, no functional changes] Trying to build cmake-native on a host system where curl was built with cmake (resulting in CURLConfig.cmake and friends, which do not use the same naming schemes expected by cmake-native's build process, being installed to a system wide cmake directory like /usr/lib64/cmake/CURL) results in undefined references to all libcurl symbols. The problem is that cmake-native sees and uses the system wide /usr/lib64/cmake/CURL/CURLConfig.cmake, which defines CURL::libcurl and CURL::curl as opposed to setting ${CURL_LIBRARIES} as expected by cmake-native. find_package(CURL) (cmake-native's CMakeLists.txt, line 478) succeeds, but incorrectly uses the system wide CURLConfig.cmake, resulting CMAKE_CURL_LIBRARIES to be set to an empty string (cmake-native's CMakeLists.txt, line 484), causing the cmake-native build to miss -lcurl. The simplest fix is to let cmake know the right value for CURL_LIBRARIES. Making it -lcurl should always work with libcurl-native in recipe-sysroot-native. [YOCTO #14951] (From OE-Core rev: 62b117c382ffd65f6c5d808699b664f70ba6f2d8) Signed-off-by: Bernhard Rosenkränzer <bero@baylibre.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 2659c735a464c956b4fca0894a5aed27a0fe7e37) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.24.0.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb b/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb
index 722a486f20..bcc87eb8f2 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb
@@ -32,6 +32,7 @@ CMAKE_EXTRACONF = "\
32 -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=0 \ 32 -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=0 \
33 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ 33 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
34 -DHAVE_SYS_ACL_H=0 \ 34 -DHAVE_SYS_ACL_H=0 \
35 -DCURL_LIBRARIES=-lcurl \
35" 36"
36 37
37do_configure () { 38do_configure () {