TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB libcarddav: Add definitions for multi-arch.

Browse Source 
CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 52581ba188)
pull/92/head
Slávek Banko 5 years ago
parent f659960e62
commit 034d35c645
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
debian/_base/dependencies/libcarddav/debian/control vendored
Unescape View File

@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libcarddav Package: libcarddav
Architecture: any Architecture: any
Multi-Arch: same
Section: libs Section: libs
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}
Description: Description:
@ -14,6 +15,7 @@ Description:
Package: libcarddav-dev Package: libcarddav-dev
Architecture: any Architecture: any
Multi-Arch: foreign
Section: libdevel Section: libdevel
Depends: libcarddav (= ${binary:Version}) Depends: libcarddav (= ${binary:Version})
Description: Description:

7
debian/_base/dependencies/libcarddav/debian/rules vendored
Unescape View File

@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && 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 := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
-DWITH_ALL_OPTIONS="ON" \ -DWITH_ALL_OPTIONS="ON" \
-DBUILD_ALL="ON" -DBUILD_ALL="ON"

2
ubuntu/_base/dependencies/libcarddav/debian/control
Unescape View File

@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libcarddav Package: libcarddav
Architecture: any Architecture: any
Multi-Arch: same
Section: libs Section: libs
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}
Description: Description:
@ -14,6 +15,7 @@ Description:
Package: libcarddav-dev Package: libcarddav-dev
Architecture: any Architecture: any
Multi-Arch: foreign
Section: libdevel Section: libdevel
Depends: libcarddav (= ${binary:Version}) Depends: libcarddav (= ${binary:Version})
Description: Description:

7
ubuntu/_base/dependencies/libcarddav/debian/rules
Unescape View File

@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && 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 := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
-DWITH_ALL_OPTIONS="ON" \ -DWITH_ALL_OPTIONS="ON" \
-DBUILD_ALL="ON" -DBUILD_ALL="ON"

Write Preview
Loading…
Cancel
Save