From 3e7c64331262e5e5238f04465670e1b1e96a2383 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 11 Jul 2019 12:42:54 +0900 Subject: DEB: enable parallel build in debian-tde.mk. Signed-off-by: Michele Calgaro --- ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk | 2 ++ ubuntu/_base/dependencies/arts/debian/rules | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'ubuntu/_base/dependencies/arts') diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index 7f5debe08..c3167d04f 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -15,10 +15,6 @@ include debian/cdbs/debian-tde.mk DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ -- cgit v1.2.1