summaryrefslogtreecommitdiffstats
path: root/dilos/core/tde-i18n/debian
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2021-05-10 02:57:11 +0200
committerSlávek Banko <[email protected]>2021-05-12 13:03:27 +0200
commitc6979fb7acfb6e35a0a197af99500e06645d3e30 (patch)
tree83f1f1e5afd95de92666a0d89ead68417daa7bb0 /dilos/core/tde-i18n/debian
parentb61211a0480af41249bc9072c1d5c8dd1eca00f3 (diff)
downloadtde-packaging-c6979fb7acfb6e35a0a197af99500e06645d3e30.tar.gz
tde-packaging-c6979fb7acfb6e35a0a197af99500e06645d3e30.zip
DEB: Swith cmake builds to use ninja-build.
Cleaning automake dependencies. Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit ad1898f6e2ef733686f2c03e19e3f320cab8ef13)
Diffstat (limited to 'dilos/core/tde-i18n/debian')
-rw-r--r--dilos/core/tde-i18n/debian/control2
-rwxr-xr-xdilos/core/tde-i18n/debian/rules11
2 files changed, 10 insertions, 3 deletions
diff --git a/dilos/core/tde-i18n/debian/control b/dilos/core/tde-i18n/debian/control
index 066dcb7e0..a1523f04a 100644
--- a/dilos/core/tde-i18n/debian/control
+++ b/dilos/core/tde-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <[email protected]>
Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-i18n-af-trinity
diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules
index 0c61a9499..6c4b01fce 100755
--- a/dilos/core/tde-i18n/debian/rules
+++ b/dilos/core/tde-i18n/debian/rules
@@ -25,6 +25,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+
# 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| .*||" | \
@@ -59,7 +66,7 @@ $(STAMP_BUILD):
[ -e $(cur_lang_dir)/CMakeLists.txt ] || \
ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
cd $(cur_lang_dir)/build && \
- cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \
+ cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
$(MAKE) $(DEB_MAKE_PARALLEL)
touch $@
@@ -72,7 +79,7 @@ install:: $(I18N_INSTALL)
$(I18N_INSTALL): build
cd $(cur_lang_dir)/build && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(DEB_MAKE_PARALLEL)
+ DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL)
clean: $(I18N_CLEAN) debian-clean