summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-02 11:56:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-02 11:56:32 +0200
commit4c24555e43dbdf57533ef5691f029b46853492f7 (patch)
tree52c87452b6cf418bf5b011d8f7d84836623cf4d2
parent9c9a0deafd4172306640d0ec1c75684bee39e4a8 (diff)
Fix parallel building
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules14
2 files changed, 7 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 0ca496f..dd3bdb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xsd (4.0.0-6) UNRELEASED; urgency=medium
+
+ * Fix parallel building (Closes: #823271).
+ Thanks to Pino Toscano <pino@debian.org>
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 02 Sep 2016 11:31:04 +0200
+
xsd (4.0.0-5) unstable; urgency=medium
* debian/patches/0100-C++Parser_Expat_support.patch:
diff --git a/debian/rules b/debian/rules
index f1fe1f8..1649d46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,25 +15,11 @@ export DH_OPTIONS
#
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-#
-# Get the number of cpus
-#
-NO_CPUS=$(shell nproc)
-ifeq ($(NO_CPUS),0)
-NO_CPUS=1
-endif
-
export verbose=1
%:
dh $@ --with autotools-dev --parallel
-override_dh_auto_build:
- make -j$(NO_CPUS)
-
-override_dh_auto_test:
- make -j$(NO_CPUS) test
-
override_dh_clean:
rm -f $(CURDIR)/libcult/build/system/configuration-dynamic.make
make xsd_clean_gen=n clean