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.
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
Herwig7 81x #2477
Merged
Merged
Herwig7 81x #2477
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff -Naur Herwig-7.0.0/m4/boost.m4 boost.m4 | ||
| --- Herwig-7.0.0/m4/boost.m4 2015-07-08 13:52:11.770227514 +0100 | ||
| +++ boost.m4 2015-08-17 10:13:36.115747311 +0100 | ||
| @@ -372,8 +372,8 @@ | ||
| AC_DEFUN([_BOOST_FIND_LIBS], | ||
| [Boost_lib=no | ||
| case "$3" in #( | ||
| - (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( | ||
| - (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #( | ||
| + (mt | mt-) boost_mt=; boost_rtopt=;; #( | ||
| + (mt* | mt-*) boost_mt=; boost_rtopt=`expr "X$3" : 'X-*\(.*\)'`;; #( | ||
| (*) boost_mt=; boost_rtopt=$3;; | ||
| esac | ||
| if test $enable_static_boost = yes; then | ||
| @@ -388,7 +388,7 @@ | ||
| esac | ||
| # If the PREFERRED-RT-OPT are not empty, prepend a `-'. | ||
| test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" | ||
| - $boost_guess_use_mt && boost_mt=-mt | ||
| + $boost_guess_use_mt && boost_mt= | ||
| # Look for the abs path the static archive. | ||
| # $libext is computed by Libtool but let's make sure it's non empty. | ||
| test -z "$libext" && | ||
| @@ -423,7 +423,7 @@ | ||
| for boost_lib_ in $2; do | ||
| for boost_tag_ in -$boost_cv_lib_tag ''; do | ||
| for boost_ver_ in -$boost_cv_lib_version ''; do | ||
| -for boost_mt_ in $boost_mt -mt ''; do | ||
| +for boost_mt_ in $boost_mt ''; do | ||
| for boost_rtopt_ in $boost_rtopt '' -d; do | ||
| for boost_lib in \ | ||
| boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,67 @@ | ||
| ### RPM external herwigpp 2.7.1 | ||
| Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distribution/herwig++/herwig++-%{realversion}-src.tgz | ||
| Requires: boost thepeg gsl hepmc | ||
| ### RPM external herwigpp 7.0.2 | ||
| Source: https://www.hepforge.org/archive/herwig/Herwig-%{realversion}.tar.bz2 | ||
| #Source: https://mharrend.web.cern.ch/mharrend/herwig7/Herwig-7.0.2.tar.bz2 | ||
|
|
||
| # Tried to comment out the parts which build HerwigDefaults.rpo during make install | ||
|
|
||
| Requires: lhapdf | ||
| Requires: boost | ||
| Requires: thepeg | ||
| Requires: gsl | ||
| Requires: hepmc | ||
| Requires: fastjet | ||
| Requires: madgraph5amcatnlo | ||
| Requires: openloops | ||
|
|
||
| # Patch since otherwise Boost wants multithreaded lib, even though only single-threaded lib is installed | ||
| # Problem exists since Herwig++3Beta | ||
|
|
||
| Patch0: herwigpp-missingBoostMTLib | ||
|
|
||
|
|
||
| BuildRequires: autotools | ||
| BuildRequires: lhapdf | ||
|
|
||
|
|
||
| %if "%{?cms_cxx:set}" != "set" | ||
| %define cms_cxx g++ | ||
| %endif | ||
|
|
||
| %if "%{?cms_cxxflags:set}" != "set" | ||
| %define cms_cxxflags -O2 -std=c++0x | ||
| %endif | ||
|
|
||
| %prep | ||
| %setup -q -n herwig++/%{realversion} | ||
| %setup -q -n Herwig-%{realversion} | ||
|
|
||
| %patch0 -p1 | ||
| # %patch1 -p1 | ||
|
|
||
| # Regenerate build scripts | ||
| autoreconf -fiv | ||
|
|
||
| %build | ||
| # Update to detect aarch64 and ppc64le | ||
| rm -f ./Config/config.{sub,guess} | ||
| curl -L -k -s -o ./Config/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' | ||
| curl -L -k -s -o ./Config/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' | ||
| chmod +x ./Config/config.{sub,guess} | ||
| CXX="$(which %{cms_cxx}) -fPIC" | ||
| CC="$(which gcc) -fPIC" | ||
| PLATF_CONF_OPTS="--enable-shared --disable-static" | ||
|
|
||
| ./configure \ | ||
| --disable-silent-rules --with-gsl=$GSL_ROOT --with-thepeg=$THEPEG_ROOT --with-boost=${BOOST_ROOT} --prefix=%i \ | ||
| CXXFLAGS="-fuse-cxa-atexit %cms_cxxflags" CXX="%cms_cxx" | ||
| ./configure $PLATF_CONF_OPTS \ | ||
| --with-thepeg=$THEPEG_ROOT \ | ||
| --with-fastjet=$FASTJET_ROOT \ | ||
| --with-gsl=$GSL_ROOT \ | ||
| --with-boost=$BOOST_ROOT \ | ||
| --with-madgraph=$MADGRAPH5AMCATNLO_ROOT \ | ||
| --with-openloops=$OPENLOOPS_ROOT \ | ||
| --prefix=%i \ | ||
| CXX="$CXX" CC="$CC" \ | ||
| BOOST_ROOT="$BOOST_ROOT" LDFLAGS="$LDFLAGS -L$BOOST_ROOT/lib" \ | ||
| LD_LIBRARY_PATH=$LHAPDF_ROOT/lib:$GSL_ROOT/lib:$LD_LIBRARY_PATH | ||
|
|
||
|
|
||
| # Fix up a configuration mistake coming from a test being confused | ||
| # by the "skipping incompatible" linking messages when linking 32bit on 64bit | ||
| perl -p -i -e 's|/usr/lib64/libm.a /usr/lib64/libc.a||' Makefile | ||
| perl -p -i -e 's|/usr/lib64/libm.a /usr/lib64/libc.a||' */Makefile | ||
| perl -p -i -e 's|/usr/lib64/libm.a /usr/lib64/libc.a||' */*/Makefile | ||
| perl -p -i -e 's|/usr/lib64/libm.a /usr/lib64/libc.a||' */*/*/Makefile | ||
|
|
||
| make %makeprocesses | ||
| make %makeprocesses all LD_LIBRARY_PATH=$LHAPDF_ROOT/lib:$THEPEG_ROOT/lib/ThePEG:$GSL_ROOT/lib:$FASTJET_ROOT/lib:$BOOST_ROOT/lib:$LD_LIBRARY_PATH LIBRARY_PATH=$FASTJET_ROOT/lib | ||
|
|
||
| %install | ||
| #tar -c -h lib include | tar -x -C %i | ||
| make install | ||
| make install LD_LIBRARY_PATH=$LHAPDF_ROOT/lib:$THEPEG_ROOT/lib/ThePEG:$GSL_ROOT/lib:$FASTJET_ROOT/lib:$BOOST_ROOT/lib:$LD_LIBRARY_PATH LIBRARY_PATH=$FASTJET_ROOT/lib:$THEPEG_ROOT/lib/ThePEG:$LHAPDF_ROOT/lib LHAPDF_DATA_PATH=$LHAPDF_ROOT/share/LHAPDF | ||
|
|
||
|
|
||
|
|
||
| %post | ||
| %{relocateConfig}share/Herwig++/HerwigDefaults.rpo | ||
| %{relocateConfig}share/Herwig7/HerwigDefaults.rpo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@smuzaffar I am sorry it seems that I uploaded not the newest version of the tool file.
All parts with Herwig7 have to be changed to just Herwig as we found out in the old PR.
Sorry for the additional efforts required. If you want and have time this week I will buy you a beer at the CERN R1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is your original commit where you had Herwig7. The fix is part of another commit. If you see the final changes (by going to File Changed tab then you will see the right path)