From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 17 Nov 2019 21:42:04 +0000 (-0800)
Subject: cmake: Install host packages to lib instead of lib64
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopenwrt.git;a=commitdiff_plain;h=383abffb1179a142b4c8f86559baad5b24d391c3;hp=d034a1f4577108a465e8347d11a51dc0e5a29298

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>
---

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) \
 	)