From 72a98ec7f538cf6855533fc06416c19355cd871b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Nov 2019 13:42:04 -0800 Subject: [PATCH] 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 Tested-by: Sebastian Kemper (cherry picked from commit 383abffb1179a142b4c8f86559baad5b24d391c3) --- include/cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/cmake.mk b/include/cmake.mk index 5c96e446d6..75bf0d751c 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) \ ) -- 2.25.1