[SCM] CLHEP: A Class Library for High Energy Physics branch, master, updated. upstream/2.1.2.4-14-gc57dc1c

[Lifeng Sun]

The following commit has been merged in the master branch:
commit c57dc1c5cf5979fbcfc968e530e31f1e4db29b88
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 14 10:40:54 2012 +0000

    Fix deadlock on hurd-i386.

diff --git a/debian/rules b/debian/rules
index 80e76d8..8ffb849 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DH_OPTIONS
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
@@ -12,6 +14,12 @@ LDFLAGS  :=$(shell dpkg-buildflags --get LDFLAGS)
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
 
+dhopt := 
+
+ifneq (hurd-i386,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
+dhopt := --parallel
+endif
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf html
@@ -27,4 +35,4 @@ override_dh_auto_build-indep:
 	doxygen doxygen.conf
 
 %:
-	dh $@ --with autoreconf --parallel
+	dh $@ --with autoreconf $(dhopt)

-- 
CLHEP: A Class Library for High Energy Physics