Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Herwig7 from 7.1.4 to 7.2.0 #5765

Merged
merged 1 commit into from Apr 21, 2020
Merged

Upgrade Herwig7 from 7.1.4 to 7.2.0 #5765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 1 addition & 26 deletions herwigpp.spec
View file
Open in desktop
@@ -1,4 +1,4 @@
### RPM external herwigpp 7.1.4
### RPM external herwigpp 7.2.0
Source: https://www.hepforge.org/archive/herwig/Herwig-%{realversion}.tar.bz2

Requires: lhapdf
Expand All @@ -15,17 +15,9 @@ Requires: openloops
%endif
BuildRequires: autotools

# Patch since otherwise Boost wants multithreaded lib, even though only single-threaded lib is installed
# Problem exists since Herwig++3Beta
Patch0: herwigpp-missingBoostMTLib
Patch1: herwigpp-7.1.2-gcc8

%prep
%setup -q -n Herwig-%{realversion}

%patch0 -p1
%patch1 -p1

# Regenerate build scripts
autoreconf -fiv

Expand Down Expand Up @@ -57,23 +49,6 @@ make %makeprocesses all
%install
make %makeprocesses install LHAPDF_DATA_PATH=$LHAPDF_ROOT/share/LHAPDF

#FxFx.so needs to be build after herwigpp installation so that it can correctly pick up needed headers
#FIX for 7.1.4: need to fix path in Makefile to build the FxFx.so library correctly
#Maybe not needed for future versions. Bug has been reported to the authors
sed -i -e "s|UEBase.fh|Shower/UEBase.fh|g" Shower/UEBase.h
sed -i -e "s|Herwig/Shower/Couplings/ShowerAlpha.h|Herwig/Shower/Core/Couplings/ShowerAlpha.h|g" Contrib/FxFx/FxFxHandler.h
sed -i -e "s|^HERWIGINCLUDE.*|HERWIGINCLUDE = -I%{i}/include|g" Contrib/FxFx/Makefile
sed -i -e "s|^RIVETINCLUDE.*|RIVETINCLUDE = -I${RIVET_ROOT}/include|g" Contrib/FxFx/Makefile
sed -i -e "s|^HEPMCINCLUDE.*|HEPMCINCLUDE = -I${HEPMC_ROOT}/include|g" Contrib/FxFx/Makefile
sed -i "/^FASTJETLIB.*/a YODAINCLUDE= -I${YODA_ROOT}/include" Contrib/FxFx/Makefile
sed -i "/^YODAINCLUDE=.*/a BOOSTINCLUDE= -I${BOOST_ROOT}/include" Contrib/FxFx/Makefile
sed -i -e "/^INCLUDE.*/s/$/ \$(YODAINCLUDE) \$(BOOSTINCLUDE)/" Contrib/FxFx/Makefile
sed -i "/^FASTJETLIB.*/a HERWIGINSTALL = %{i}" Contrib/FxFx/Makefile
sed -i -e '0,/\$(HERWIGINSTALL)\/lib\/Herwig/s//\$(HERWIGINSTALL)\/lib\/./' Contrib/FxFx/Makefile
sed -i '/FxFxAnalysis/d' Contrib/FxFx/FxFxEventHandler.h

make -C Contrib/FxFx %makeprocesses FxFx.so FxFxHandler.so
cp Contrib/FxFx/*.so %{i}/lib/Herwig/.

mv %{i}/bin/Herwig %{i}/bin/Herwig-cms
cat << \HERWIG_WRAPPER > %{i}/bin/Herwig
Expand Down
5 changes: 2 additions & 3 deletions thepeg.spec
View file
Open in desktop
@@ -1,10 +1,9 @@
### RPM external thepeg 2.1.4
### RPM external thepeg 2.2.0
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib/ThePEG
## INITENV +PATH DYLD_LIBRARY_PATH %{i}/lib/ThePEG

# Download from official webpage
Source: http://www.hepforge.org/archive/thepeg/ThePEG-%{realversion}.tar.bz2
Patch0: thepeg-2.1.1-gcc8

Requires: lhapdf
Requires: gsl OpenBLAS
Expand All @@ -24,7 +23,7 @@ BuildRequires: lhapdf

%prep
%setup -q -n ThePEG-%{realversion}
%patch0 -p1

# Regenerate build scripts
autoreconf -fiv

Expand Down