diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-10-13 10:23:00 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-10-13 10:23:23 +0200 |
| commit | f659960e62210a81b1981f4cee1c04a703c08a10 (patch) | |
| tree | 72cb6a0de8b99a7fab4078bc1664feca22ee76c5 | |
| parent | 55ded7ab9bc7409720e0ee7f2ff230a6ef2e51aa (diff) | |
| download | tde-packaging-f659960e62210a81b1981f4cee1c04a703c08a10.tar.gz tde-packaging-f659960e62210a81b1981f4cee1c04a703c08a10.zip | |
DEB libcaldav: Add definitions for multi-arch.
CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b739baf7230a8b83f8b9e48d551e5fc8fb4bff4b)
4 files changed, 18 insertions, 0 deletions
diff --git a/debian/_base/dependencies/libcaldav/debian/control b/debian/_base/dependencies/libcaldav/debian/control index d3b1e2080..7d8dc70a8 100644 --- a/debian/_base/dependencies/libcaldav/debian/control +++ b/debian/_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/debian/_base/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index 56e8f5415..c75240154 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_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" 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" |