diff --git a/SCRAMV1.spec b/SCRAMV1.spec index e7c7de9c8d3..dc6ec99714a 100644 --- a/SCRAMV1.spec +++ b/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 diff --git a/rivet.spec b/rivet.spec index 4eba253f7d1..cc0ea1656e0 100644 --- a/rivet.spec +++ b/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/* diff --git a/scram-project-build.file b/scram-project-build.file index 09093d64325..53e0ea5dcb7 100644 --- a/scram-project-build.file +++ b/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" diff --git a/scram-tools.file/tools/cmssw/cmssw.xml b/scram-tools.file/tools/cmssw/cmssw.xml index 130570558a3..53a20400515 100644 --- a/scram-tools.file/tools/cmssw/cmssw.xml +++ b/scram-tools.file/tools/cmssw/cmssw.xml @@ -9,6 +9,7 @@ + diff --git a/scram-tools.file/tools/rivet/rivet.xml b/scram-tools.file/tools/rivet/rivet.xml index b1723d487f8..962cabdb5af 100644 --- a/scram-tools.file/tools/rivet/rivet.xml +++ b/scram-tools.file/tools/rivet/rivet.xml @@ -6,7 +6,6 @@ -