From d4ed0ff49e8b26492c8d0a3f2b5c8483b1fe07cb Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Aug 23 2020 13:31:51 +0000 Subject: Add -std=c++11 for lhapdf 6.3 --- diff --git a/pythia8.spec b/pythia8.spec index 77e632e..791aff7 100644 --- a/pythia8.spec +++ b/pythia8.spec @@ -7,7 +7,7 @@ Name: pythia8 Version: 8.2.44 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pythia Event Generator for High Energy Physics License: GPLv2+ @@ -118,7 +118,7 @@ dos2unix -k share/Pythia8/htmldoc/pythia.css \ %build ./configure --prefix=%{_prefix} --prefix-lib=%{_libdir} \ - --cxx-common="%{optflags} -fPIC" \ + --cxx-common="%{optflags} -std=c++11 -fPIC" \ --cxx-shared="%{?__global_ldflags} -Wl,-z,defs -shared" \ --lib-suffix="-%{version}.so" \ --enable-shared \ @@ -130,19 +130,17 @@ ln -s libpythia8-%{version}.so lib/libpythia8.so make lib/pythia8.py PYTHON_BIN='#' mv lib/pythia8.py . -%if %{?fedora}%{!?fedora:0} >= 30 %ifarch %{arm} # Reduce memory usage during compilation of the python module on 32 bit arm MEMSAVE=-g1 %endif -%endif %if %{buildpy2} mkdir py2 PY2INC=$(pkg-config --cflags python2) PY2LIB=$(pkg-config --libs python2) g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py2/PythonWrapper.o \ - ${PY2INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT $MEMSAVE + ${PY2INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT $MEMSAVE g++ py2/PythonWrapper.o -Llib -lpythia8 -o py2/_pythia8.so \ ${PY2LIB} -ldl %{?__global_ldflags} -shared %endif @@ -152,7 +150,7 @@ PY3INC=$(pkg-config --cflags python3) PY3LIB=$(pkg-config --libs python3) PY3SOABI=$(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))") g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py3/PythonWrapper.o \ - ${PY3INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT $MEMSAVE + ${PY3INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT $MEMSAVE g++ py3/PythonWrapper.o -Llib -lpythia8 -o py3/_pythia8.${PY3SOABI}.so \ ${PY3LIB} -ldl %{?__global_ldflags} -shared @@ -162,7 +160,7 @@ PY3INC=$(pkg-config --cflags python-%{python3_other_version}) PY3LIB=$(pkg-config --libs python-%{python3_other_version}) PY3SOABI=$(%{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))") g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py3oth/PythonWrapper.o \ - ${PY3INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT + ${PY3INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT g++ py3oth/PythonWrapper.o -Llib -lpythia8 -o py3oth/_pythia8.${PY3SOABI}.so \ ${PY3LIB} -ldl %{?__global_ldflags} -shared %endif @@ -262,6 +260,9 @@ touch %{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info %license COPYING %changelog +* Sun Aug 23 2020 Mattias Ellert - 8.2.44-2 +- Add -std=c++11 for lhapdf 6.3 + * Sun Aug 23 2020 Mattias Ellert - 8.2.44-1 - Update to version 8.2.44 - Drop EPEL 6 specializations (will be EOL November 2020)