summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-10-13 10:25:52 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-10-13 10:26:07 +0200
commit034d35c6457288c9adcca4f0cabe90117aacf08d (patch)
tree5f3bf4428c398c1811c090e6bf43d6e035b902d3
parentf659960e62210a81b1981f4cee1c04a703c08a10 (diff)
downloadtde-packaging-r14.0.x.zip
tde-packaging-r14.0.x.tar.gz
DEB libcarddav: Add definitions for multi-arch.r14.0.x
CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 52581ba1881a5d9441ec9a618f9a725442f6a809)
-rw-r--r--debian/_base/dependencies/libcarddav/debian/control2
-rwxr-xr-xdebian/_base/dependencies/libcarddav/debian/rules7
-rw-r--r--ubuntu/_base/dependencies/libcarddav/debian/control2
-rwxr-xr-xubuntu/_base/dependencies/libcarddav/debian/rules7
4 files changed, 18 insertions, 0 deletions
diff --git a/debian/_base/dependencies/libcarddav/debian/control b/debian/_base/dependencies/libcarddav/debian/control
index 961e1f9..a7ceea5 100644
--- a/debian/_base/dependencies/libcarddav/debian/control
+++ b/debian/_base/dependencies/libcarddav/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libcarddav
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends}
Description:
@@ -14,6 +15,7 @@ Description:
Package: libcarddav-dev
Architecture: any
+Multi-Arch: foreign
Section: libdevel
Depends: libcarddav (= ${binary:Version})
Description:
diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules
index 56e8f54..c752401 100755
--- a/debian/_base/dependencies/libcarddav/debian/rules
+++ b/debian/_base/dependencies/libcarddav/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/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control
index 961e1f9..a7ceea5 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/control
+++ b/ubuntu/_base/dependencies/libcarddav/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libcarddav
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends}
Description:
@@ -14,6 +15,7 @@ Description:
Package: libcarddav-dev
Architecture: any
+Multi-Arch: foreign
Section: libdevel
Depends: libcarddav (= ${binary:Version})
Description:
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules
index 56e8f54..c752401 100755
--- a/ubuntu/_base/dependencies/libcarddav/debian/rules
+++ b/ubuntu/_base/dependencies/libcarddav/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"