From f659960e62210a81b1981f4cee1c04a703c08a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 13 Oct 2019 10:23:00 +0200 Subject: DEB libcaldav: Add definitions for multi-arch. CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit b739baf7230a8b83f8b9e48d551e5fc8fb4bff4b) --- ubuntu/_base/dependencies/libcaldav/debian/control | 2 ++ ubuntu/_base/dependencies/libcaldav/debian/rules | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'ubuntu') diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control index d3b1e2080..7d8dc70a8 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/control +++ b/ubuntu/_base/dependencies/libcaldav/debian/control @@ -7,6 +7,7 @@ Standards-Version: 3.8.3 Package: libcaldav Architecture: any +Multi-Arch: same Section: libs Depends: ${shlibs:Depends} Description: @@ -14,6 +15,7 @@ Description: Package: libcaldav-dev Architecture: any +Multi-Arch: foreign Section: libdevel Depends: libcaldav (= ${binary:Version}) Description: diff --git a/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index 56e8f5415..c75240154 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/debian/rules @@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_ALL_OPTIONS="ON" \ -DBUILD_ALL="ON" -- cgit v1.2.1