Merge pull request #9142 from cms-sw/140x-multiarch-fix

[14.0.X] Backported fix for multiarch unit tests

SCRAMV1.spec

@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_66
+### RPM lcg SCRAMV1 V3_00_68
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag da05d3bb7d0390df7e04b9e68775a9725201b65c
+%define tag 15a8797db3180ba786e6e131a9c4e3011b53bc68
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

rivet.spec

@@ -3,6 +3,7 @@
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 ## OLD GENSER Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz
 Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+Source99: scram-tools.file/tools/eigen/env
 Patch0: rivet-deprecated-warn
 Requires: hepmc fastjet fastjet-contrib yoda
 BuildRequires: python3 py3-cython autotools
@@ -11,6 +12,8 @@ BuildRequires: python3 py3-cython autotools
 %setup -n %{n}-%{realversion}
 %patch0 -p1
 
+%build
+source %{_sourcedir}/env
 # Update config.{guess,sub} to detect aarch64 and ppc64le
 rm -f %{_tmppath}/config.{sub,guess}
 %get_config_guess %{_tmppath}/config.guess
@@ -34,7 +37,7 @@ autoreconf -fiv
 %ifarch aarch64
 sed -i -e 's|^ax_openmp_flags=".*"|ax_openmp_flags="none"|' ./configure
 %endif
-CXXFLAGS="-std=c++%{cms_cxx_standard}"
+CXXFLAGS="-std=c++%{cms_cxx_standard} $CMS_EIGEN_CXX_FLAGS"
 %ifarch x86_64
     CXXFLAGS="${CXXFLAGS} -msse3"
 %endif
@@ -48,8 +51,8 @@ PYTHON=$(which python3) \
 # The following hack insures that the bins with the library linked explicitly
 # rather than indirectly, as required by the gold linker
 perl -p -i -e "s|LIBS = $|LIBS = -lHepMC|g" bin/Makefile
-%build
-make %{makeprocesses} all 
+make %{makeprocesses} all
+
 %install
 make install 
 sed -i -e 's|^#!.*python.*|#!/usr/bin/env python3|' %{i}/bin/*

scram-project-build.file

@@ -55,7 +55,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-02-10
+%define configtag       V09-02-13
 %endif
 
 %if "%{?buildarch:set}" != "set"

scram-tools.file/tools/cmssw/cmssw.xml

@@ -9,6 +9,7 @@
   </client>
   <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/biglib/$SCRAM_ARCH" type="path"/>
   <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/>
+  <runtime name="RIVET_ANALYSIS_PATH"      value="$LOCALTOP/lib/$SCRAM_ARCH" type="path"/>
   <runtime name="PATH"       value="$CMSSW_BINDIR" type="path"/>
   <runtime name="PYTHON3PATH" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$CMSSW_BASE/src" type="path"/>

scram-tools.file/tools/rivet/rivet.xml

@@ -6,7 +6,6 @@
 <environment name="INCLUDE" default="$RIVET_BASE/include"/>
 </client>
 <runtime name="PATH" value="$RIVET_BASE/bin" type="path"/>
-<runtime name="RIVET_ANALYSIS_PATH" value="$RIVET_BASE/lib/Rivet" type="path"/>
 <runtime name="RIVET_DATA_PATH" value="$RIVET_BASE/share/Rivet" type="path"/>
 <runtime name="PDFPATH" default="$RIVET_BASE/share" type="path"/>
 <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>