Browse Source

DEB libcarddav: Add definitions for multi-arch.

CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
bug/2273/luks
Slávek Banko 1 month ago
parent
commit
52581ba188
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
4 changed files with 18 additions and 0 deletions
  1. +2
    -0
      debian/_base/dependencies/libcarddav/debian/control
  2. +7
    -0
      debian/_base/dependencies/libcarddav/debian/rules
  3. +2
    -0
      ubuntu/_base/dependencies/libcarddav/debian/control
  4. +7
    -0
      ubuntu/_base/dependencies/libcarddav/debian/rules

+ 2
- 0
debian/_base/dependencies/libcarddav/debian/control View File

@@ -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:

+ 7
- 0
debian/_base/dependencies/libcarddav/debian/rules View File

@@ -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"

+ 2
- 0
ubuntu/_base/dependencies/libcarddav/debian/control View File

@@ -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:

+ 7
- 0
ubuntu/_base/dependencies/libcarddav/debian/rules View File

@@ -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"

Loading…
Cancel
Save