Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions herwig7.spec
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ Patch3: herwig_MB
autoreconf -fiv

%build
CXX="$(which g++) -fPIC -std=c++%{cms_cxx_standard}"
CC="$(which gcc) -fPIC -std=c++%{cms_cxx_standard}"
EX_FLAGS="-fPIC -std=c++%{cms_cxx_standard}"
%if %{is_debug_build herwig7}
EX_FLAGS="${EX_FLAGS} -g -O0"
%endif
CXX="$(which g++) ${EX_FLAGS}"
CC="$(which gcc) ${EX_FLAGS}"
PLATF_CONF_OPTS="--enable-shared --disable-static"
FCFLAGS=""
if [[ `gcc --version | head -1 | cut -d' ' -f3 | cut -d. -f1,2,3 | tr -d .` -gt 1000 ]] ; then FCFLAGS="-fallow-argument-mismatch" ; fi
Expand All @@ -44,7 +48,7 @@ PYTHON=python3 ./configure --prefix=%i \
--with-fastjet=$FASTJET_ROOT \
--with-gsl=$GSL_ROOT \
--with-boost=$BOOST_ROOT \
--with-madgraph=$MADGRAPH5AMCATNLO_ROOT \
--with-madgraph=$MADGRAPH5AMCATNLO_ROOT \
--with-gosam=$GOSAM_ROOT \
--with-gosam-contrib=$GOSAMCONTRIB_ROOT \
--with-hepmc=$HEPMC_ROOT \
Expand Down
4 changes: 3 additions & 1 deletion thepeg.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ CXX="$(which %{cms_cxx}) -fPIC"
CC="$(which gcc) -fPIC"
PLATF_CONF_OPTS="--enable-shared --disable-static"


# Update to detect aarch64 and ppc64le
rm -f ./Config/config.{sub,guess}
%get_config_sub ./Config/config.sub
Expand All @@ -44,6 +43,9 @@ chmod +x ./Config/config.{sub,guess}

sed -i -e "s|-lgslcblas|-lopenblas|" ./configure
COMPILE_FLAGS="-g0 -O2 -DNDEBUG -std=c++%{cms_cxx_standard}"
%if %{is_debug_build thepeg}
COMPILE_FLAGS="${COMPILE_FLAGS} -g -O0"
%endif
./configure $PLATF_CONF_OPTS \
--with-lhapdf=$LHAPDF_ROOT \
--with-boost=$BOOST_ROOT \
Expand Down