summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/tdebase
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-07-11 12:42:54 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-07-11 12:42:54 +0900
commit3e7c64331262e5e5238f04465670e1b1e96a2383 (patch)
tree793763a37e637de2380a9406b4455318cc1e33f5 /ubuntu/_base/tdebase
parent420633c6862ead221800c5f61266baad560ef32f (diff)
downloadtde-packaging-3e7c64331262e5e5238f04465670e1b1e96a2383.tar.gz
tde-packaging-3e7c64331262e5e5238f04465670e1b1e96a2383.zip
DEB: enable parallel build in debian-tde.mk.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'ubuntu/_base/tdebase')
-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 79df1b036..3f02cb040 100755
--- a/ubuntu/_base/tdebase/debian/rules
+++ b/ubuntu/_base/tdebase/debian/rules
@@ -63,10 +63,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_LIBCONFIG="ON" \
-DWITH_PCRE="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 \