summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/dependencies/libcaldav/debian/control2
-rwxr-xr-xdebian/_base/dependencies/libcaldav/debian/rules7
-rw-r--r--ubuntu/_base/dependencies/libcaldav/debian/control2
-rwxr-xr-xubuntu/_base/dependencies/libcaldav/debian/rules7
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"