[Build-common-hackers] Bug#893505: cdbs should pass CMAKE_INSTALL_LIBDIR for cross compilation

[Helmut Grohne]

Package: cdbs
Version: 0.4.156
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:editorconfig-core

cmake typically guesses the CMAKE_INSTALL_LIBDIR wrong for cross
compilation. Thus debhelper passes it explicitly. cdbs should do the
same. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru cdbs-0.4.156/1/class/cmake.mk.in cdbs-0.4.156+nmu1/1/class/cmake.mk.in
--- cdbs-0.4.156/1/class/cmake.mk.in	2017-06-27 15:30:40.000000000 +0200
+++ cdbs-0.4.156+nmu1/1/class/cmake.mk.in	2018-03-19 14:30:14.000000000 +0100
@@ -64,7 +64,8 @@
 	$(patsubst %,-DCMAKE_SYSTEM_NAME=%,\
 		$(_cdbs_cmake_system_name_$(DEB_HOST_ARCH_OS))) \
 	-DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_GNU_CPU) \
-	-DPKG_CONFIG_EXECUTABLE=/usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
+	-DPKG_CONFIG_EXECUTABLE=/usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config \
+	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
diff --minimal -Nru cdbs-0.4.156/debian/changelog cdbs-0.4.156+nmu1/debian/changelog
--- cdbs-0.4.156/debian/changelog	2017-10-16 21:25:50.000000000 +0200
+++ cdbs-0.4.156+nmu1/debian/changelog	2018-03-19 14:30:16.000000000 +0100
@@ -1,3 +1,10 @@
+cdbs (0.4.156+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass CMAKE_INSTALL_LIBDIR for cross compilation. Closes: #-1.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 19 Mar 2018 14:30:16 +0100
+
 cdbs (0.4.156) unstable; urgency=medium
 
   * Really fix conditionally set crossbuild compiler.