From 161dc5c1e9c1a10e73ce89e8b8b07eab195de0f4 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 28 Jun 2018 15:10:06 +0200 Subject: [PATCH 1/3] Remove blackhat and sherpa-blackhat --- cmake/toolchain/heptools-dev-generators.cmake | 2 - .../heptools-dev-generatorspython3.cmake | 2 - generators/CMakeLists.txt | 80 +++++++++---------- 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake index 9fff046be..388741a2b 100644 --- a/cmake/toolchain/heptools-dev-generators.cmake +++ b/cmake/toolchain/heptools-dev-generators.cmake @@ -121,9 +121,7 @@ LCG_external_package(starlight r300 ${MCGENPATH}/starlight LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) - LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/cmake/toolchain/heptools-dev-generatorspython3.cmake b/cmake/toolchain/heptools-dev-generatorspython3.cmake index a92cee433..6dd6382b5 100644 --- a/cmake/toolchain/heptools-dev-generatorspython3.cmake +++ b/cmake/toolchain/heptools-dev-generatorspython3.cmake @@ -80,9 +80,7 @@ LCG_external_package(starlight r193 ${MCGENPATH}/starlight LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) - LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 6a6e6eda3..26a29c62c 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1469,47 +1469,43 @@ LCGPackage_Add( #---BlackHat------------------------------------------------------------------------------------------ -if(${Python_native_version} VERSION_LESS 3) - LCGPackage_Add( - blackhat - URL ${gen_url}/blackhat-${blackhat_native_version}.tar.gz - CONFIGURE_COMMAND ./configure - --prefix= - --with-QDpath=${qd_home} "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" - PYTHON=${Python_home}/bin/${PYTHON} - ${library_path}=${Python_home}/lib:$ENV{${library_path}} - PYTHONPATH=${Python_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH} - INSTALL_COMMAND make install "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" - BUILD_IN_SOURCE 1 - DEPENDS qd - ) -endif() +#LCGPackage_Add( +# blackhat +# URL ${gen_url}/blackhat-${blackhat_native_version}.tar.gz +# CONFIGURE_COMMAND ./configure +# --prefix= +# --with-QDpath=${qd_home} "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" +# PYTHON=${Python_home}/bin/${PYTHON} +# ${library_path}=${Python_home}/lib:$ENV{${library_path}} +# PYTHONPATH=${Python_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH} +# INSTALL_COMMAND make install "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" +# BUILD_IN_SOURCE 1 +# DEPENDS qd +#) -if(${Python_native_version} VERSION_LESS 3) - foreach (v ${blackhat_native_version}) - LCG_add_test(blackhat-${v}.build - BINARY_DIR blackhat/tests/${v} - SOURCE_DIR blackhat/tests - BUILD all - BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules - -DBLACKHAT_ROOT_DIR=${blackhat-${v}_home} - -DQD_ROOT_DIR=${qd_home} - # ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:${qd_home}/lib:$ENV{${library_path}} - ) +#foreach (v ${blackhat_native_version}) +# LCG_add_test(blackhat-${v}.build +# BINARY_DIR blackhat/tests/${v} +# SOURCE_DIR blackhat/tests +# BUILD all +# BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules +# -DBLACKHAT_ROOT_DIR=${blackhat-${v}_home} +# -DQD_ROOT_DIR=${qd_home} +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:${qd_home}/lib:$ENV{${library_path}} +# ) - LCG_add_test(blackhat-${v}.native-cpp_example - TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./cpp_example - ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:$ENV{${library_path}} - DEPENDS blackhat-${v}.build - ) +# LCG_add_test(blackhat-${v}.native-cpp_example +# TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./cpp_example +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:$ENV{${library_path}} +# DEPENDS blackhat-${v}.build +# ) - LCG_add_test(blackhat-${v}.native-fortran_example - TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./fortran_example - ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib/blackhat:${qd_home}/lib:$ENV{${library_path}} - DEPENDS blackhat-${v}.build - ) - endforeach() -endif() +# LCG_add_test(blackhat-${v}.native-fortran_example +# TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./fortran_example +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib/blackhat:${qd_home}/lib:$ENV{${library_path}} +# DEPENDS blackhat-${v}.build +# ) +endforeach() #---Sherpa------------------------------------------------------------------------------------------ LCGPackage_Add( @@ -1522,9 +1518,9 @@ LCGPackage_Add( --enable-hepmc2=${HepMC_home} --enable-openloops=. --enable-lhole - IF MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN - --enable-blackhat=${blackhat_home} - ENDIF +# IF MATCHES "blackhat" THEN +# --enable-blackhat=${blackhat_home} +# ENDIF IF NOT VERSION_LESS 2.2.1 THEN --enable-fastjet=${fastjet_home} ENDIF @@ -1552,7 +1548,7 @@ LCGPackage_Add( DEPENDS lhapdf-_lhapdf> HepMC IF NOT APPLE THEN sqlite ENDIF IF NOT VERSION_LESS 2.2.1 THEN fastjet ENDIF - IF MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN blackhat ENDIF +# IF MATCHES "blackhat" THEN blackhat ENDIF ) #---Sherpa with MPI support------------------------------------------------------------------------------------------ -- GitLab From 8c94f3b22b7040b346e278715c5183ffd21bbba0 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 28 Jun 2018 16:08:25 +0200 Subject: [PATCH 2/3] Added ThePEG 2.1.4, Herwig3 7.1.4 and hjets-1.2-herwig-7.1.4 to experimental --- cmake/toolchain/heptools-experimental.cmake | 3 + generators/patches/herwig3-7.1.4.patch | 69 +++++++++++++++++++++ generators/patches/thepeg-2.1.4.patch | 14 +++++ 3 files changed, 86 insertions(+) create mode 100644 generators/patches/herwig3-7.1.4.patch create mode 100644 generators/patches/thepeg-2.1.4.patch diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake index 1394cc51b..ad3b7def6 100644 --- a/cmake/toolchain/heptools-experimental.cmake +++ b/cmake/toolchain/heptools-experimental.cmake @@ -444,6 +444,7 @@ LCG_external_package(thepeg 1.9.2p1 ${MCGENPATH}/thepeg author # LCG_external_package(thepeg 2.1.0 ${MCGENPATH}/thepeg rivet=2.5.3) # LCG_external_package(thepeg 2.1.1 ${MCGENPATH}/thepeg rivet=2.5.4) LCG_external_package(thepeg 2.1.3 ${MCGENPATH}/thepeg rivet=2.6.0) +LCG_external_package(thepeg 2.1.4 ${MCGENPATH}/thepeg rivet=2.6.0) LCG_external_package(thepeg 2.1.2 ${MCGENPATH}/thepeg rivet=2.6.0) @@ -455,12 +456,14 @@ LCG_external_package(herwig++ 2.7.1 ${MCGENPATH}/herwig++ the # LCG_external_package(herwig3 7.1.0 ${MCGENPATH}/herwig++ thepeg=2.1.0 madgraph=2.5.4 openloops=1.3.1 lhapdf=6.1.6.cxxstd) #LCG_external_package(herwig3 7.1.1 ${MCGENPATH}/herwig++ thepeg=2.1.1 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) LCG_external_package(herwig3 7.1.3 ${MCGENPATH}/herwig++ thepeg=2.1.3 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) +LCG_external_package(herwig3 7.1.4 ${MCGENPATH}/herwig++ thepeg=2.1.4 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) LCG_external_package(herwig3 7.1.2 ${MCGENPATH}/herwig++ thepeg=2.1.2 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) # LCG_external_package(hjets 1.1-herwig-7.0.4 ${MCGENPATH}/hjets herwig=7.0.4 author=1.1) # LCG_external_package(hjets 1.2-herwig-7.1.0 ${MCGENPATH}/hjets herwig=7.1.0 author=1.2) # LCG_external_package(hjets 1.2-herwig-7.1.1 ${MCGENPATH}/hjets herwig=7.1.1 author=1.2) LCG_external_package(hjets 1.2-herwig-7.1.3 ${MCGENPATH}/hjets herwig=7.1.3 author=1.2) +LCG_external_package(hjets 1.2-herwig-7.1.4 ${MCGENPATH}/hjets herwig=7.1.4 author=1.2) LCG_external_package(hjets 1.2-herwig-7.1.2 ${MCGENPATH}/hjets herwig=7.1.2 author=1.2) if (NOT (${LCG_LCG_TARGET} MATCHES "clang")) diff --git a/generators/patches/herwig3-7.1.4.patch b/generators/patches/herwig3-7.1.4.patch new file mode 100644 index 000000000..6059e5df1 --- /dev/null +++ b/generators/patches/herwig3-7.1.4.patch @@ -0,0 +1,69 @@ +--- m4/boost.m4.orig 2017-05-22 17:58:23.370068742 +0200 ++++ m4/boost.m4 2017-11-10 09:37:15.000000001 +0100 +@@ -422,10 +422,10 @@ + # Don't bother to ident the following nested for loops, only the 2 + # innermost ones matter. + 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_rtopt_ in $boost_rtopt '' -d; 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_rtopt_ in '' $boost_rtopt -d; do + for boost_lib in \ + boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ + boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +@@ -1416,6 +1416,9 @@ + # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines + # the same defines as GCC's). + for i in \ ++ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 9 @ clang39" \ ++ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 8 @ clang38" \ ++ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 7 @ clang37" \ + _BOOST_mingw_test(7, 1) \ + _BOOST_gcc_test(7, 1) \ + _BOOST_mingw_test(6, 3) \ +@@ -1424,6 +1427,8 @@ + _BOOST_gcc_test(6, 2) \ + _BOOST_mingw_test(6, 1) \ + _BOOST_gcc_test(6, 1) \ ++ _BOOST_mingw_test(6, 0) \ ++ _BOOST_gcc_test(6, 0) \ + _BOOST_mingw_test(5, 4) \ + _BOOST_gcc_test(5, 4) \ + _BOOST_mingw_test(5, 3) \ +--- Contrib/FxFx/Makefile.in.orig 2017-04-25 14:23:15.000000000 +0200 ++++ Contrib/FxFx/Makefile.in 2017-05-31 18:02:27.325268508 +0200 +@@ -7,16 +7,17 @@ + # + # Location of include files + THEPEGINCLUDE = +-HERWIGINCLUDE = ++HERWIGINCLUDE ?= + GSLINCLUDE = + FASTJETINCLUDE = ++BOOSTINCLUDE ?= + RIVETINCLUDE = -I$(shell rivet-config --includedir --cppflags) + HEPMCINCLUDE = + # Messy hack, not guaranteed to work: + FASTJETLIB = `echo $(FASTJETINCLUDE) | sed "s/-I//" | sed "s/ //"`/../lib/ + LDFLAGS = -L$(FASTJETLIB) -lfastjet $(shell rivet-config --ldflags --libs) + SHARED_FLAG = +-INCLUDE = $(THEPEGINCLUDE) $(HERWIGINCLUDE) $(GSLINCLUDE) $(FASTJETINCLUDE) $(RIVETINCLUDE) $(HEPMCINCLUDE) ++INCLUDE = $(THEPEGINCLUDE) $(HERWIGINCLUDE) $(GSLINCLUDE) $(FASTJETINCLUDE) $(RIVETINCLUDE) $(HEPMCINCLUDE) $(BOOSTINCLUDE) + # C++ flags + CXX = + CXXFLAGS = +--- Contrib/FxFx/FxFxHandler.h.orig 2017-05-31 20:56:38.041956123 +0200 ++++ Contrib/FxFx/FxFxHandler.h 2017-05-31 20:56:46.964044998 +0200 +@@ -8,7 +8,7 @@ + #include "Herwig/Shower/QTilde/QTildeShowerHandler.h" + #include "Herwig/Shower/ShowerHandler.h" + #include "ThePEG/Config/Pointers.h" +-#include "Herwig/Shower/Couplings/ShowerAlpha.h" ++#include "Herwig/Shower/Core/Couplings/ShowerAlpha.h" + #include "fastjet/PseudoJet.hh" + #include "fastjet/ClusterSequence.hh" + #include "ThePEG/Utilities/CompSelector.h" diff --git a/generators/patches/thepeg-2.1.4.patch b/generators/patches/thepeg-2.1.4.patch new file mode 100644 index 000000000..90c61fc99 --- /dev/null +++ b/generators/patches/thepeg-2.1.4.patch @@ -0,0 +1,14 @@ +--- m4/rivet.m4.orig 2013-10-16 10:50:05.000000000 +0200 ++++ m4/rivet.m4 2017-08-02 12:26:22.897894696 +0200 +@@ -33,10 +33,7 @@ + else + AC_MSG_RESULT([$with_rivet]) + RIVETINCLUDE="$( $with_rivet/bin/rivet-config --cppflags )" +- RIVETLIBS="-L$with_rivet/lib -R$with_rivet/lib -lRivet" +- if test "${host_cpu}" == "x86_64" -a -e $with_rivet/lib64/libRivet.so ; then +- RIVETLIBS="-L$with_rivet/lib64 -R$with_rivet/lib64 -lRivet" +- fi ++ RIVETLIBS="$( $with_rivet/bin/rivet-config --libs ) -lYODA" + fi + + if test "x$with_rivet" != "xno"; then -- GitLab From 872832e3e896b95c92601fb6c867a8006e62819e Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 28 Jun 2018 16:13:02 +0200 Subject: [PATCH 3/3] Revert accidental commit --- cmake/toolchain/heptools-experimental.cmake | 3 - generators/patches/herwig3-7.1.4.patch | 69 --------------------- generators/patches/thepeg-2.1.4.patch | 14 ----- 3 files changed, 86 deletions(-) delete mode 100644 generators/patches/herwig3-7.1.4.patch delete mode 100644 generators/patches/thepeg-2.1.4.patch diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake index ad3b7def6..1394cc51b 100644 --- a/cmake/toolchain/heptools-experimental.cmake +++ b/cmake/toolchain/heptools-experimental.cmake @@ -444,7 +444,6 @@ LCG_external_package(thepeg 1.9.2p1 ${MCGENPATH}/thepeg author # LCG_external_package(thepeg 2.1.0 ${MCGENPATH}/thepeg rivet=2.5.3) # LCG_external_package(thepeg 2.1.1 ${MCGENPATH}/thepeg rivet=2.5.4) LCG_external_package(thepeg 2.1.3 ${MCGENPATH}/thepeg rivet=2.6.0) -LCG_external_package(thepeg 2.1.4 ${MCGENPATH}/thepeg rivet=2.6.0) LCG_external_package(thepeg 2.1.2 ${MCGENPATH}/thepeg rivet=2.6.0) @@ -456,14 +455,12 @@ LCG_external_package(herwig++ 2.7.1 ${MCGENPATH}/herwig++ the # LCG_external_package(herwig3 7.1.0 ${MCGENPATH}/herwig++ thepeg=2.1.0 madgraph=2.5.4 openloops=1.3.1 lhapdf=6.1.6.cxxstd) #LCG_external_package(herwig3 7.1.1 ${MCGENPATH}/herwig++ thepeg=2.1.1 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) LCG_external_package(herwig3 7.1.3 ${MCGENPATH}/herwig++ thepeg=2.1.3 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) -LCG_external_package(herwig3 7.1.4 ${MCGENPATH}/herwig++ thepeg=2.1.4 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) LCG_external_package(herwig3 7.1.2 ${MCGENPATH}/herwig++ thepeg=2.1.2 madgraph=2.6.1 openloops=1.3.1 lhapdf=6.2.0) # LCG_external_package(hjets 1.1-herwig-7.0.4 ${MCGENPATH}/hjets herwig=7.0.4 author=1.1) # LCG_external_package(hjets 1.2-herwig-7.1.0 ${MCGENPATH}/hjets herwig=7.1.0 author=1.2) # LCG_external_package(hjets 1.2-herwig-7.1.1 ${MCGENPATH}/hjets herwig=7.1.1 author=1.2) LCG_external_package(hjets 1.2-herwig-7.1.3 ${MCGENPATH}/hjets herwig=7.1.3 author=1.2) -LCG_external_package(hjets 1.2-herwig-7.1.4 ${MCGENPATH}/hjets herwig=7.1.4 author=1.2) LCG_external_package(hjets 1.2-herwig-7.1.2 ${MCGENPATH}/hjets herwig=7.1.2 author=1.2) if (NOT (${LCG_LCG_TARGET} MATCHES "clang")) diff --git a/generators/patches/herwig3-7.1.4.patch b/generators/patches/herwig3-7.1.4.patch deleted file mode 100644 index 6059e5df1..000000000 --- a/generators/patches/herwig3-7.1.4.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- m4/boost.m4.orig 2017-05-22 17:58:23.370068742 +0200 -+++ m4/boost.m4 2017-11-10 09:37:15.000000001 +0100 -@@ -422,10 +422,10 @@ - # Don't bother to ident the following nested for loops, only the 2 - # innermost ones matter. - 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_rtopt_ in $boost_rtopt '' -d; 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_rtopt_ in '' $boost_rtopt -d; do - for boost_lib in \ - boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ - boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ -@@ -1416,6 +1416,9 @@ - # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines - # the same defines as GCC's). - for i in \ -+ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 9 @ clang39" \ -+ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 8 @ clang38" \ -+ "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 7 @ clang37" \ - _BOOST_mingw_test(7, 1) \ - _BOOST_gcc_test(7, 1) \ - _BOOST_mingw_test(6, 3) \ -@@ -1424,6 +1427,8 @@ - _BOOST_gcc_test(6, 2) \ - _BOOST_mingw_test(6, 1) \ - _BOOST_gcc_test(6, 1) \ -+ _BOOST_mingw_test(6, 0) \ -+ _BOOST_gcc_test(6, 0) \ - _BOOST_mingw_test(5, 4) \ - _BOOST_gcc_test(5, 4) \ - _BOOST_mingw_test(5, 3) \ ---- Contrib/FxFx/Makefile.in.orig 2017-04-25 14:23:15.000000000 +0200 -+++ Contrib/FxFx/Makefile.in 2017-05-31 18:02:27.325268508 +0200 -@@ -7,16 +7,17 @@ - # - # Location of include files - THEPEGINCLUDE = --HERWIGINCLUDE = -+HERWIGINCLUDE ?= - GSLINCLUDE = - FASTJETINCLUDE = -+BOOSTINCLUDE ?= - RIVETINCLUDE = -I$(shell rivet-config --includedir --cppflags) - HEPMCINCLUDE = - # Messy hack, not guaranteed to work: - FASTJETLIB = `echo $(FASTJETINCLUDE) | sed "s/-I//" | sed "s/ //"`/../lib/ - LDFLAGS = -L$(FASTJETLIB) -lfastjet $(shell rivet-config --ldflags --libs) - SHARED_FLAG = --INCLUDE = $(THEPEGINCLUDE) $(HERWIGINCLUDE) $(GSLINCLUDE) $(FASTJETINCLUDE) $(RIVETINCLUDE) $(HEPMCINCLUDE) -+INCLUDE = $(THEPEGINCLUDE) $(HERWIGINCLUDE) $(GSLINCLUDE) $(FASTJETINCLUDE) $(RIVETINCLUDE) $(HEPMCINCLUDE) $(BOOSTINCLUDE) - # C++ flags - CXX = - CXXFLAGS = ---- Contrib/FxFx/FxFxHandler.h.orig 2017-05-31 20:56:38.041956123 +0200 -+++ Contrib/FxFx/FxFxHandler.h 2017-05-31 20:56:46.964044998 +0200 -@@ -8,7 +8,7 @@ - #include "Herwig/Shower/QTilde/QTildeShowerHandler.h" - #include "Herwig/Shower/ShowerHandler.h" - #include "ThePEG/Config/Pointers.h" --#include "Herwig/Shower/Couplings/ShowerAlpha.h" -+#include "Herwig/Shower/Core/Couplings/ShowerAlpha.h" - #include "fastjet/PseudoJet.hh" - #include "fastjet/ClusterSequence.hh" - #include "ThePEG/Utilities/CompSelector.h" diff --git a/generators/patches/thepeg-2.1.4.patch b/generators/patches/thepeg-2.1.4.patch deleted file mode 100644 index 90c61fc99..000000000 --- a/generators/patches/thepeg-2.1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- m4/rivet.m4.orig 2013-10-16 10:50:05.000000000 +0200 -+++ m4/rivet.m4 2017-08-02 12:26:22.897894696 +0200 -@@ -33,10 +33,7 @@ - else - AC_MSG_RESULT([$with_rivet]) - RIVETINCLUDE="$( $with_rivet/bin/rivet-config --cppflags )" -- RIVETLIBS="-L$with_rivet/lib -R$with_rivet/lib -lRivet" -- if test "${host_cpu}" == "x86_64" -a -e $with_rivet/lib64/libRivet.so ; then -- RIVETLIBS="-L$with_rivet/lib64 -R$with_rivet/lib64 -lRivet" -- fi -+ RIVETLIBS="$( $with_rivet/bin/rivet-config --libs ) -lYODA" - fi - - if test "x$with_rivet" != "xno"; then -- GitLab