summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/dependencies
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/dependencies
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/dependencies')
-rw-r--r--ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk2
-rw-r--r--ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk2
-rwxr-xr-xubuntu/_base/dependencies/arts/debian/rules4
-rw-r--r--ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk2
4 files changed, 6 insertions, 4 deletions
diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
index 4eeb672b0..7a55130b2 100644
--- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/akode/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/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[,.]" \
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
index 4eeb672b0..7a55130b2 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/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 \