aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2019-11-17 13:42:04 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-23 00:22:07 +0100
commit383abffb1179a142b4c8f86559baad5b24d391c3 (patch)
tree56e4384a3194f545022fec3dc60300ceef470bbd
parentd034a1f4577108a465e8347d11a51dc0e5a29298 (diff)
downloadupstream-383abffb1179a142b4c8f86559baad5b24d391c3.tar.gz
upstream-383abffb1179a142b4c8f86559baad5b24d391c3.tar.bz2
upstream-383abffb1179a142b4c8f86559baad5b24d391c3.zip
cmake: Install host packages to lib instead of lib64
Several CMake packages such as log4cplus and protobuf(-c) install to lib64 instead of lib on some hosts. This completely breaks rpath linking. Override it globally to avoid fixing each package individually. Signed-off-by: Rosen Penev <rosenp@gmail.com> Tested-by: Sebastian Kemper <sebastian_ml@gmx.net>
-rw-r--r--include/cmake.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/cmake.mk b/include/cmake.mk
index b66665d20a..a5ba7d31bf 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -103,6 +103,7 @@ define Host/Configure/Default
-DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
-DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
-DCMAKE_SKIP_RPATH=TRUE \
+ -DCMAKE_INSTALL_LIBDIR=lib \
$(CMAKE_HOST_OPTIONS) \
$(HOST_CMAKE_SOURCE_DIR) \
)