diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-10 02:57:11 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-12 13:03:27 +0200 |
| commit | c6979fb7acfb6e35a0a197af99500e06645d3e30 (patch) | |
| tree | 83f1f1e5afd95de92666a0d89ead68417daa7bb0 /ubuntu/_base/core/tde-i18n/debian | |
| parent | b61211a0480af41249bc9072c1d5c8dd1eca00f3 (diff) | |
| download | tde-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 <slavek.banko@axis.cz>
(cherry picked from commit ad1898f6e2ef733686f2c03e19e3f320cab8ef13)
Diffstat (limited to 'ubuntu/_base/core/tde-i18n/debian')
| -rw-r--r-- | ubuntu/_base/core/tde-i18n/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/core/tde-i18n/debian/rules | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control index 1148232d5..09235f18e 100644 --- a/ubuntu/_base/core/tde-i18n/debian/control +++ b/ubuntu/_base/core/tde-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -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/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules index 3ab71190d..962092a46 100755 --- a/ubuntu/_base/core/tde-i18n/debian/rules +++ b/ubuntu/_base/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| .*||" | \ @@ -60,7 +67,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 $@ @@ -73,7 +80,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 |