Merge IB/CMSSW_11_0_X/master into IB/CMSSW_11_0_X/rootmaster.

cms-sw · Sep 18, 2019 · 7629b3d · 7629b3d
2 parents 4b79484 + 0026ab3
commit 7629b3d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -175,14 +175,14 @@ Requires: igprof-toolfile
 Requires: cuda-toolfile
 Requires: cub-toolfile
 Requires: cuda-api-wrappers-toolfile
+Requires: openloops-toolfile
 %endif
 
 %if %isamd64
 Requires: dmtcp-toolfile
 Requires: tkonlinesw-toolfile
 Requires: oracle-toolfile
 Requires: intel-vtune
-Requires: openloops-toolfile
 
 %if %isslc
 Requires: glibc-toolfile

diff --git a/geneva-toolfile.spec b/geneva-toolfile.spec
@@ -23,7 +23,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geneva.xml
   <use name="py2-numpy"/>
   <use name="HepMC"/>
   <use name="lhapdf"/>
-%ifarch x86_64
+%ifnarch ppc64le
   <use name="openloops"/>
 %endif
   <use name="gsl"/>

diff --git a/geneva.spec b/geneva.spec
@@ -5,7 +5,7 @@ Source: git+https://stash.desy.de/scm/geneva/geneva-public.git?obj=master/%{real
 BuildRequires: cmake gmake
 
 Requires: python py2-setuptools py2-numpy gsl OpenBLAS lhapdf hepmc pythia8
-%ifarch x86_64
+%ifnarch ppc64le
 Requires: openloops
 %endif
 
@@ -14,7 +14,7 @@ Requires: openloops
 
 %build
 
-%ifarch x86_64
+%ifnarch ppc64le
 export OPENLOOPS_FLAG="-Dopenloops_ROOT=${OPENLOOPS_ROOT}"
 %endif
 

diff --git a/herwigpp-toolfile.spec b/herwigpp-toolfile.spec
@@ -23,7 +23,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/herwigpp.xml
   <use name="lhapdf"/>
   <use name="thepeg"/>
   <use name="madgraph5amcatnlo"/>
-%ifarch x86_64
+%ifnarch ppc64le
   <use name="openloops"/>
 %endif
 </tool>

diff --git a/herwigpp.spec b/herwigpp.spec
@@ -10,7 +10,7 @@ Requires: gsl OpenBLAS
 Requires: fastjet
 Requires: gosamcontrib gosam
 Requires: madgraph5amcatnlo
-%ifarch x86_64
+%ifnarch ppc64le
 Requires: openloops
 %endif
 BuildRequires: autotools
@@ -44,7 +44,7 @@ sed -i -e "s|-lgslcblas|-lopenblas|" ./configure
             --with-gosam=$GOSAM_ROOT \
             --with-gosam-contrib=$GOSAMCONTRIB_ROOT \
             --with-hepmc=$HEPMC_ROOT \
-%ifarch x86_64
+%ifnarch ppc64le
             --with-openloops=$OPENLOOPS_ROOT \
 %endif
 %ifnarch x86_64

diff --git a/sherpa-toolfile.spec b/sherpa-toolfile.spec
@@ -35,9 +35,11 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml
   <use name="fastjet"/>
   <use name="sqlite"/>
   <use name="openmpi"/>
-%ifarch x86_64
+%if %islinux
+%ifnarch ppc64le
   <use name="openloops"/>
-%endif
+%endif # isamd64
+%endif # islinux
 </tool>
 EOF_TOOLFILE
 

diff --git a/sherpa.spec b/sherpa.spec
@@ -9,9 +9,11 @@ BuildRequires: mcfm swig
 %define islinux %(case $(uname -s) in (Linux) echo 1 ;; (*) echo 0 ;; esac)
 %define isamd64 %(case %{cmsplatf} in (*amd64*) echo 1 ;; (*) echo 0 ;; esac)
 
-%ifarch x86_64
+%if %islinux
+%ifnarch ppc64le
 Requires: openloops
-%endif
+%endif # is not ppc64
+%endif # islinux
 
 %prep
 %setup -q -n SHERPA-MC-%{realversion}