aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2021-10-05 15:15:37 +0200
committerArmin Kuster <akuster808@gmail.com>2021-10-08 17:23:52 -0700
commit42ceb9d961cef22bfbb4fb872724ec6e8d95652d (patch)
tree8ba3e1f39558ba62d6c770d9682f4117cd700e00 /meta-oe
parent5a1cc12c2f507aede95a6bf3a113856d7d17a025 (diff)
downloadmeta-openembedded-contrib-42ceb9d961cef22bfbb4fb872724ec6e8d95652d.tar.gz
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 <rhi@pengutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 8e6e4e594d77bc317491eecccd125ae725d70ecb) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb3
1 files changed, 3 insertions, 0 deletions
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.