From 6eae1a16a1001287ef5129db86f4ef2145ace3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 18 May 2021 19:34:29 +0200 Subject: [PATCH] DEB uncrustify: Switch to build using ninja-build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../uncrustify-trinity-0.72.0/debian/changelog | 6 ++++++ .../uncrustify-trinity-0.72.0/debian/control | 2 +- .../uncrustify-trinity-0.72.0/debian/rules | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog index fdc5124d..de5b18ae 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog @@ -1,3 +1,9 @@ +uncrustify-trinity (0.72.0-0debian11.0.0+8) unstable; urgency=medium + + * Switch to build using ninja-build + + -- Slávek Banko Tue, 18 May 2021 19:30:49 +0200 + uncrustify-trinity (0.72.0-0debian11.0.0+7) unstable; urgency=medium * TDE version 0.72-0+7 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control index cab8ba3a..c0391c70 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control @@ -2,7 +2,7 @@ Source: uncrustify-trinity Section: deps-r14/devel Priority: optional Maintainer: Alexander GQ Gerasiov -Build-Depends: debhelper (>= 9~), cmake (>= 3.0~), python3 (>= 3.3~), gcc (>= 4:4.9~) +Build-Depends: debhelper (>= 9~), cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~) Standards-Version: 4.5.0 Homepage: https://github.com/uncrustify/uncrustify Vcs-Git: https://salsa.debian.org/debian/uncrustify.git diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules index 8b6ebe74..2ed2ae90 100755 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules @@ -3,11 +3,18 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +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 + %: dh $@ override_dh_auto_configure: - dh_auto_configure $@ -- -DUNCRUSTIFY_SEPARATE_TESTS=ON + dh_auto_configure $@ -- $(DEB_CMAKE_NORMAL_ARGS) -DUNCRUSTIFY_SEPARATE_TESTS=ON override_dh_clean: dh_clean