From 6b5f55d85aef572ff594baeec0d6de9d4c5916c4d2f16739fffe8ef08a64fbc8 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 10 Feb 2017 17:33:47 +0000 Subject: [PATCH] Accepting request 456076 from home:matejcik:branches:devel:libraries:c_c++ update python macros to work with new pythons, replace macros that are being phased out OBS-URL: https://build.opensuse.org/request/show/456076 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=192 --- boost.changes | 5 +++++ boost.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/boost.changes b/boost.changes index 64cb95c..5a5a255 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 10 13:35:53 UTC 2017 - jmatejek@suse.com + +- update python macros + ------------------------------------------------------------------- Fri Feb 3 15:58:17 UTC 2017 - adam.majer@suse.de diff --git a/boost.spec b/boost.spec index 90d8d66..51a3c08 100644 --- a/boost.spec +++ b/boost.spec @@ -1056,9 +1056,9 @@ cp user-config.jam user-config-py.jam cat << EOF >> user-config-py.jam using python : %{py_ver} - : %{__python2} - : %{py_incdir} - : %{py_libdir} + : %{_bindir}/python2 + : %{_includedir}/python%{py_ver} + : %{_libdir}/python%{py_ver} : : ; @@ -1076,12 +1076,13 @@ EOF # Build boost python3 and MPI, installed in python3 staging %if %{with python3} +%{?!py3_abiflags:%define py3_abiflags m} cp user-config.jam user-config-py3.jam cat << EOF >> user-config-py3.jam using python : %{py3_ver} - : /usr/bin/python%{py3_ver}%{py3_abiflags} - : %{py3_incdir} + : %{_bindir}/python3 + : %{_includedir}/python%{py3_ver}%{py3_abiflags} : : : .%{py3_soflags}