diff mbox series

[OpenWrt-Devel] cmake: Install host packages to lib instead of lib64

Message ID 20191117214204.293611-1-rosenp@gmail.com
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series [OpenWrt-Devel] cmake: Install host packages to lib instead of lib64 | expand

Commit Message

Rosen Penev Nov. 17, 2019, 9:42 p.m. UTC
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>
---
 include/cmake.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Sebastian Kemper Dec. 14, 2019, 10:21 p.m. UTC | #1
On Sun, Nov 17, 2019 at 01:42:04PM -0800, Rosen Penev wrote:
> 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>
> ---
>  include/cmake.mk | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/cmake.mk b/include/cmake.mk
> index a304ab3f70..2726b83a1e 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) \
>  	)

This works fine and solves the problem, tested with protobuf/host.

Thanks Rosen!

Tested-by: Sebastian Kemper <sebastian_ml@gmx.net>
diff mbox series

Patch

diff --git a/include/cmake.mk b/include/cmake.mk
index a304ab3f70..2726b83a1e 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) \
 	)