summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/tdebase/debian
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-07-10 23:17:14 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-07-10 23:20:44 +0900
commit8fa083ac8de98a8dc56a76c85418be5e9fa28f4d (patch)
tree66296f0f671554001f002dd841d20d53f5ab2368 /ubuntu/_base/tdebase/debian
parentfc51e6682e68c4976f5ca82da232785b6bc4818f (diff)
downloadtde-packaging-8fa083ac8de98a8dc56a76c85418be5e9fa28f4d.tar.gz
tde-packaging-8fa083ac8de98a8dc56a76c85418be5e9fa28f4d.zip
DEB: enable parallel build in debian-tde.mk.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/_base/tdebase/debian')
-rw-r--r--ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk2
-rwxr-xr-xubuntu/_base/tdebase/debian/rules4
2 files changed, 2 insertions, 4 deletions
diff --git a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
index 4eeb672b0..7a55130b2 100644
--- a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdebase/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/tdebase/debian/rules b/ubuntu/_base/tdebase/debian/rules
index 1fed17a20..741dc7f52 100755
--- a/ubuntu/_base/tdebase/debian/rules
+++ b/ubuntu/_base/tdebase/debian/rules
@@ -64,10 +64,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_PCRE="ON" \
-DWITH_KRB5="ON"
-# 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_FIXPERMS_EXCLUDE := \
opt/trinity/bin/kcheckpass \
opt/trinity/bin/tdekbdledsync \