From 42ceb9d961cef22bfbb4fb872724ec6e8d95652d Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Tue, 5 Oct 2021 15:15:37 +0200 Subject: rapidjson: override hard-coded lib install dir The default value for LIB_INSTALL_DIR is set to ${prefix}/lib in CMakeLists.txt. However, in multilib builds, the package split picks up the files from ${prefix}/lib64 or ${prefix}/lib32, which leads to QA issues in do_package about left-over files in /usr/lib/pkgconfig and /usr/lib/cmake. Signed-off-by: Roland Hieber Signed-off-by: Khem Raj (cherry picked from commit 8e6e4e594d77bc317491eecccd125ae725d70ecb) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 384dd5129c..0dd6edb854 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -15,6 +15,9 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" +# the install path for cmake modules etc. is hardcoded as ${prefix}/lib in +# CMakeLists.txt, which breaks the package split with multilib +EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${libdir}" # RapidJSON is a header-only C++ library, so the main package will be empty. -- cgit 1.2.3-korg