Commit 32ee9d26 authored by Simon Braß's avatar Simon Braß
Browse files

Exclude m4 (glibc >2.27 issue) and add ROOT to HepMC3

parent e3996110
......@@ -58,7 +58,7 @@ fi
test -z "${ROOT_DIR}" && ROOT_DIR="${PREFIX}"
export PATH="${PREFIX}/bin:${PATH}"
export LD_LIBRARY_PATH="${PREFIX}/lib:${PREFIX}/OpenLoops/lib:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH="${PREFIX}/lib:${PREFIX}/OpenLoops/lib:${LD_LIBRARY_PATH}"
########################################################################
# The locations of the sofware packages
......@@ -467,7 +467,7 @@ DELPHES_CONFIG=(
HEPMC3_CONFIG=(
-DCMAKE_INSTALL_PREFIX="${PREFIX}"
-DHEPMC3_ENABLE_PYTHON="OFF"
-DHEPMC3_ENABLE_ROOTIO="OFF"
-DROOT_DIR="${ROOT_DIR}/cmake"
)
WHIZARD_CONFIG=(
......@@ -491,7 +491,7 @@ RIVET_CONFIG=(
function main() {
mkdir -p "${LOG}"
mkdir -p "${BUILD}"
cd ${BUILD} || (echo "cd: failed to go to ${BUILD}" && exit 2)
cd "${BUILD}" || (echo "cd: failed to go to ${BUILD}" && exit 2)
if test $# -eq 0 || test "$@" == ""; then
local modes=(autotools hepmc3 lhapdf fastjet pythia8 openloops whizard bin)
else
......@@ -501,7 +501,9 @@ function main() {
case $mode in
autotools)
(command -v make >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "make" "${url_make}"
(command -v m4 >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "m4" "${url_m4}"
# https://lists.gnu.org/archive/html/bug-m4/2019-10/msg00000.html
# We exclude m4 as long as there is no fix in sight.
# (command -v m4 >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "m4" "${url_m4}"
(command -v autoconf >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "autoconf" "${url_autoconf}"
(command -v automake >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "automake" "${url_automake}"
(command -v libtool >/dev/null 2>&1 && test "${FORCE}" != "True") || make_and_log "libtool" "${url_libtool}"
......@@ -514,8 +516,8 @@ function main() {
;;
lhapdf)
make_and_log "LHAPDF6" "${url_lhapdf}" "${LHAPDF_CONFIG[*]}" && \
wget https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF && \
wget https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF
wget https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz -O- | tar xz -C "${PREFIX}"/share/LHAPDF && \
wget https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz -O- | tar xz -C "${PREFIX}"/share/LHAPDF
# lhapdf install cteq6 cteq6l1 cteq66 CT10
;;
fastjet)
......
Supports Markdown
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