[SCM] ThePEG: Toolkit for High Energy Physics Event Generation branch, master, updated. upstream/1.8.0-13-g57843d9

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 57843d9881eb4b23348d9123449f0b5d7f69f504
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jun 23 17:50:47 2012 +0800

    debian/rules: don't link against LHAPDF on hurd-i386, mips* and s390.
    
    no enough RAM to load libLHAPDF.so.

diff --git a/debian/changelog b/debian/changelog
index 50dd22a..220f4c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+thepeg (1.8.0-2) UNRELEASED; urgency=low
+
+  * Don't link against LHAPDF on hurd-i386, mips* and s390. ThePEG
+    requires RAM > 2GB to load libLHAPDF.so to generate
+    ThePEGDefaults.rpo, but Debian buildds of these arches have no enough
+    RAM.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Sat, 23 Jun 2012 20:21:39 +0800
+
 thepeg (1.8.0-1) unstable; urgency=low
 
   * Initial release (Closes: #636986)
diff --git a/debian/rules b/debian/rules
index 118252b..fcc508b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ export DH_OPTIONS
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
+
 CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS   :=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS :=$(shell dpkg-buildflags --get CXXFLAGS)
@@ -15,17 +17,23 @@ LDFLAGS  :=$(shell dpkg-buildflags --get LDFLAGS)
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
-LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
+CFG := --prefix=/usr \
+       --enable-unitchecks \
+       --with-javagui \
+       --with-rivet=/usr \
+       --with-hepmc=/usr \
+       --libdir=$(LIBPATH)
+
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifeq (,$(findstring $(DEB_BUILD_ARCH), hurd-i386 mips mipsel s390))
+CFG += --with-LHAPDF=$(LIBPATH)
+else
+CFG += --with-LHAPDF=no
+endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--prefix=/usr \
-		--enable-unitchecks \
-		--with-javagui \
-		--with-rivet=/usr \
-		--with-hepmc=/usr \
-		--with-LHAPDF=$(LIBPATH) \
-		--libdir=$(LIBPATH)
+	dh_auto_configure -- $(CFG)
 
 override_dh_auto_build-indep:
 	dh_auto_build

-- 
ThePEG: Toolkit for High Energy Physics Event Generation