summaryrefslogtreecommitdiffstats
path: root/dilos/libraries
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-04-04 03:02:11 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-04-04 15:53:01 +0200
commit3d0fe45a7b0b586d096644a3581df8307787eb3a (patch)
treef6e05af72fa60089c8db1e9999d982d47be07bc8 /dilos/libraries
parent5d067f8a1c69ffd2585cd3a46f0601cc552e40d2 (diff)
downloadtde-packaging-3d0fe45a7b0b586d096644a3581df8307787eb3a.tar.gz
tde-packaging-3d0fe45a7b0b586d096644a3581df8307787eb3a.zip
DEB: Move DEB_DH_BUILDDEB_ARGS to common cdbs rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'dilos/libraries')
-rw-r--r--dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/libraries/libtdeldap/debian/rules3
-rwxr-xr-xdilos/libraries/pytdeextensions/debian/rules7
-rwxr-xr-xdilos/libraries/python-trinity/debian/rules7
4 files changed, 24 insertions, 3 deletions
diff --git a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk
index 29fca88e1..4dd4698a4 100644
--- a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk
@@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
diff --git a/dilos/libraries/libtdeldap/debian/rules b/dilos/libraries/libtdeldap/debian/rules
index c6352b9b1..967f58705 100755
--- a/dilos/libraries/libtdeldap/debian/rules
+++ b/dilos/libraries/libtdeldap/debian/rules
@@ -9,9 +9,6 @@ DEB_CONFIGURE_MANDIR := /usr/share/man
DEB_CONFIGURE_PREFIX := /usr
DEB_CONFIGURE_INFODIR := /usr/share/info
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
CPPFLAGS+= -D__dilos__
DEB_CMAKE_EXTRA_FLAGS := \
diff --git a/dilos/libraries/pytdeextensions/debian/rules b/dilos/libraries/pytdeextensions/debian/rules
index fe8947bec..009b362ca 100755
--- a/dilos/libraries/pytdeextensions/debian/rules
+++ b/dilos/libraries/pytdeextensions/debian/rules
@@ -30,8 +30,15 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --with-extra-libs=/usr/lib/$(DEB_HOST_MULTIARCH) --with-extra-includes=/usr/include
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+endif
post-patches::
# make sure that python binary exists
diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/python-trinity/debian/rules
index 34532b767..3bae8384b 100755
--- a/dilos/libraries/python-trinity/debian/rules
+++ b/dilos/libraries/python-trinity/debian/rules
@@ -13,8 +13,15 @@ DEB_CONFIGURE_INFODIR := /usr/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+endif
# This has to be exported to make some magic below work.
export DH_OPTIONS