[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-51-gfbbfb75

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit b2f2b07ca4367ecb3590e39be08dd87d88fc78d1
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Mon Aug 8 17:44:55 2011 +0200

    enable the parallel build

diff --git a/debian/changelog b/debian/changelog
index ba1f5ca..4a17e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ hdf5 (1.8.7-2~exp2) experimental; urgency=low
   * Fix package-relation-with-self on libhdf5-7 (Provides:)
   * Fix a typo in the manpage h5import & h5diff
   * Missing manpages for h5copy h5fc h5mkgrp h5perf_serial h5stat
+  * Enable parallel compilation
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Aug 2011 13:22:06 +0200
 
diff --git a/debian/rules b/debian/rules
index e4c89e0..0ab17a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,13 @@ endif
 # endif
 ###
 
+# export DEB_BUILD_OPTIONS="parallel=2"
+#
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif	
+
 CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --build=$(DEB_BUILD_GNU_TYPE) \
 		  --mandir=\$${prefix}/share/man \
@@ -140,17 +147,17 @@ build: build-stamp $(build_stamp_openmpi) build-stamp-mpich2
 
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) -C debian/build/
+	$(MAKE) $(MAKEFLAGS) -C debian/build/
 	touch $@
 
 build-stamp-openmpi: configure-stamp-openmpi 
 	dh_testdir
-	$(MAKE)  -C debian/build-openmpi/ OMPI_MCA_disable_memory_allocator=1
+	$(MAKE)  $(MAKEFLAGS) -C debian/build-openmpi/ OMPI_MCA_disable_memory_allocator=1
 	touch $@
 
 build-stamp-mpich2: configure-stamp-mpich2 
 	dh_testdir
-	$(MAKE) -C debian/build-mpich2/
+	$(MAKE)  $(MAKEFLAGS) -C debian/build-mpich2/
 	touch $@
 
 #

-- 
Hierarchical Data Format 5 (HDF5)