diff --git a/pythia8.spec b/pythia8.spec index 43a833c..5f476e6 100644 --- a/pythia8.spec +++ b/pythia8.spec @@ -22,7 +22,7 @@ Name: pythia8 Version: 8.2.35 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Pythia Event Generator for High Energy Physics License: GPLv2+ @@ -160,6 +160,13 @@ 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 if pkg-config --exists python2 ; then @@ -170,7 +177,7 @@ else PY2LIB=-lpython%{python2_version} fi g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py2/PythonWrapper.o \ - ${PY2INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT + ${PY2INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT $MEMSAVE g++ py2/PythonWrapper.o -Llib -lpythia8 -o py2/_pythia8.so \ ${PY2LIB} -ldl %{?__global_ldflags} -Wl,-z,defs -shared %endif @@ -181,7 +188,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 + ${PY3INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT $MEMSAVE g++ py3/PythonWrapper.o -Llib -lpythia8 -o py3/_pythia8.${PY3SOABI}.so \ ${PY3LIB} -ldl %{?__global_ldflags} -Wl,-z,defs -shared %endif @@ -296,6 +303,9 @@ touch %{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info %license COPYING %changelog +* Wed Feb 06 2019 Mattias Ellert - 8.2.35-7 +- Reduce memory usage during compilation of the python module on 32 bit arm + * Sat Feb 02 2019 Fedora Release Engineering - 8.2.35-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild