From 8179a1746627d43bddd4826eb00a1b23b7a8137c Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Wed, 15 Apr 2020 21:26:36 +0300 Subject: [PATCH] bot: rpm5 -> rpm4 (10) [rosa2019.05] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (10) rosa2019.05: %py_ -> %py2_, %{py_ -> %{py2_ (9): Adopt spec for enabled byte compiling in Python These automatic changes are done by scripts *rpm5-to-rpm4.sh at https://gitlab.com/abf-mirror/abf-mirror-scripts The goal is to adopt specs for RPM 4 to which ROSA 2019.1 has migrated from RPM 5, but keep compatibility with RPM 5. Details about migration are here: https://wiki.rosalab.ru/ru/index.php/Переход_ROSA_с_RPM_5_на_RPM_4 Contact m.novosyolov@rosalinux.ru in case of problems --- boost.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/boost.spec b/boost.spec index cc5baf5..926befd 100644 --- a/boost.spec +++ b/boost.spec @@ -864,9 +864,9 @@ find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*to cat > ./tools/build/src/user-config.jam << EOF using gcc : %{gcc_ver} : gcc : "%{optflags}" "%{optflags}" "%{ldflags}" ; using python : %{py3_ver} : %{_bindir}/python%{py3_ver} : %{_includedir}/python%{py3_ver}m : %{_libdir} : : : ; -using python : %{py_ver} : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} : : : ; +using python : %{py2_ver} : %{_bindir}/python%{py2_ver} : %{_includedir}/python%{py2_ver} : %{_libdir} : : : ; EOF -./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir} --with-python=%{py_ver} +./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir} --with-python=%{py2_ver} ./b2 -d+2 -q %{?_smp_mflags} --without-mpi \ --prefix=%{_prefix} --libdir=%{_libdir} \ %if !%{with context} @@ -874,7 +874,7 @@ EOF %endif linkflags="%{ldflags} -lstdc++ -lm" \ -sHAVE_ICU=1 \ - python=%{py_ver} \ + python=%{py2_ver} \ link=shared threading=multi debug-symbols=off --layout=system # Taken from the Fedora .src.rpm. @@ -889,7 +889,7 @@ echo ============================= build Boost.Build ================== --without-context --without-coroutine \ %endif link=shared \ - python=%{py_ver} \ + python=%{py2_ver} \ install echo ============================= install Boost.Build ================== @@ -907,4 +907,3 @@ echo ============================= install Boost.Build ================== ) rm -f %{buildroot}/%{_bindir}/bjam rm -f %{buildroot}/%{_mandir}/man1/bjam.1* -