[SCM] HepMC: Event Record for Monte Carlo Generators branch, master, updated. upstream/2.06.09-8-gd13b4e8

Lifeng Sun lifongsun at gmail.com
Thu Jun 21 12:28:02 UTC 2012


The following commit has been merged in the master branch:
commit d13b4e8fbee40e6fc846d60728a72a96774d815b
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 21 20:07:38 2012 +0800

    debian/rules: remove MAKEFLAGS.
    
    Run test-suite parallelly may fail.

diff --git a/debian/rules b/debian/rules
index c90680e..2edd709 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,12 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+	NUMJOBS := 1
 endif
 
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
+export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
 # package name
 PKGNAME=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f1))
@@ -57,7 +59,7 @@ override_dh_auto_install:
 
 build-arch: configure-stamp
 	dh_testdir
-	$(MAKE) $(MAKEFLAGS)
+	$(MAKE) -j$(NUMJOBS)
 
 build-indep: configure-stamp
 	dh_testdir

-- 
HepMC: Event Record for Monte Carlo Generators



More information about the debian-science-commits mailing list