Commit 3255bb04 authored by Dmitri Konstantinov's avatar Dmitri Konstantinov
Browse files

Merge branch 'LCG_101-patches_updates' into 'LCG_101-patches'

Preparation for 101_ATLAS_7: Rivet 3.1.5p1 and sherpa 2.2.11p2 with ptached binreloc added

See merge request !1024
parents 839f8f2c 2d648acf
Pipeline #3297837 passed with stage
in 3 minutes and 5 seconds
......@@ -26,15 +26,17 @@ LCG_external_package(evtgen 2.1.1 ${MCGENPATH}/evtgen ta
LCG_external_package(thepeg 2.2.1 ${MCGENPATH}/thepeg hepmc=2)
LCG_external_package(herwig3 7.2.1 ${MCGENPATH}/herwig++ thepeg=2.2.1 madgraph=3.2.0 openloops=2.1.1 lhapdf=6.2.3 hepmc=2)
LCG_external_package(sherpa 2.2.11p1 ${MCGENPATH}/sherpa hepevt=200000 author=2.2.11)
LCG_external_package(sherpa-openmpi 2.2.11p1.openmpi3 ${MCGENPATH}/sherpa hepevt=200000 author=2.2.11)
# sherpa, p2 - patch fixes binreloc problem with binutils > 2.30
LCG_external_package(sherpa 2.2.11p2 ${MCGENPATH}/sherpa hepevt=200000 author=2.2.11)
LCG_external_package(sherpa-openmpi 2.2.11p2.openmpi3 ${MCGENPATH}/sherpa hepevt=200000 author=2.2.11)
LCG_external_package(photos++ 3.64 ${MCGENPATH}/photos++ author=3.64 )
LCG_external_package(tauola++ 1.1.8 ${MCGENPATH}/tauola++ author=1.1.8 )
LCG_external_package(pythia8 306 ${MCGENPATH}/pythia8 zlib=ON )
LCG_external_package(yoda 1.9.0 ${MCGENPATH}/yoda )
LCG_external_package(rivet 3.1.5 ${MCGENPATH}/rivet hepmc=2 )
# rivet-3.1.5p1, patch fixes binreloc problem with binutils > 2.30
LCG_external_package(rivet 3.1.5p1 ${MCGENPATH}/rivet hepmc=2 author=3.1.5 )
LCG_external_package(lhapdf 6.2.3 ${MCGENPATH}/lhapdf )
# openloops 2.1.2, SPI-2027 max_string_length increased to 400, revision increased to pick pacth up.
......
......@@ -217,7 +217,7 @@ LCGPackage_Add(
#---rivet-----------------------------------------------------------------------------------------
LCGPackage_Add(
rivet
URL ${gen_url}/Rivet-<VERSION>.tar.bz2
URL ${gen_url}/Rivet-<rivet_<NATIVE_VERSION>_author>.tar.bz2
ENVIRONMENT LIBRARY_PATH=${FORTRAN_LIBRARY_DIR}
IF NOT <VERSION> VERSION_LESS 2.6.2 THEN
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rivet/gsl.m4 <SOURCE_DIR>/m4
......
--- src/Tools/binreloc.c.orig 2021-11-25 12:27:09.227238580 +0100
+++ src/Tools/binreloc.c 2021-11-25 12:28:54.956199723 +0100
@@ -215,7 +215,10 @@
break;
/* Sanity check. */
- if (strstr (line, " r-xp ") == NULL || strchr (line, '/') == NULL)
+ /* With binutils > 2.30 (const void *) "" is placed in "r--p" area of memory
+ In general, for the mechanism of detection it doesn't really matter where your symbol is,
+ therefore, check for strstr (line, " r-xp ") == NULL is removed */
+ if (strchr (line, '/') == NULL)
continue;
/* Parse line. */
--- ATOOLS/Org/binreloc.c.orig 2021-11-25 12:17:37.595451976 +0100
+++ ATOOLS/Org/binreloc.c 2021-11-25 12:24:05.628306054 +0100
@@ -216,7 +216,10 @@
break;
/* Sanity check. */
- if (strstr (line, " r-xp ") == NULL || strchr (line, '/') == NULL)
+ /* With binutils > 2.30 (const void *) "" is placed in "r--p" area of memory
+ In general, for the mechanism of detection it doesn't really matter where your symbol is,
+ therefore, check for strstr (line, " r-xp ") == NULL is removed */
+ if (strchr (line, '/') == NULL)
continue;
/* Parse line. */
--- ATOOLS/Org/binreloc.c.orig 2021-11-25 12:17:37.595451976 +0100
+++ ATOOLS/Org/binreloc.c 2021-11-25 12:24:05.628306054 +0100
@@ -216,7 +216,10 @@
break;
/* Sanity check. */
- if (strstr (line, " r-xp ") == NULL || strchr (line, '/') == NULL)
+ /* With binutils > 2.30 (const void *) "" is placed in "r--p" area of memory
+ In general, for the mechanism of detection it doesn't really matter where your symbol is,
+ therefore, check for strstr (line, " r-xp ") == NULL is removed */
+ if (strchr (line, '/') == NULL)
continue;
/* Parse line. */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment