From 4a0fc8c327086cd3c7466a30f8f09690ad7b5810 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 17 Jan 2019 22:14:43 +0100 Subject: [PATCH] Update python2/3 builds --- libtdb.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libtdb.spec b/libtdb.spec index e92214b..eef30c1 100644 --- a/libtdb.spec +++ b/libtdb.spec @@ -6,6 +6,16 @@ %global with_python2 1 %endif +%if (0%{?with_python2} == 1 && 0%{?with_python3} == 0) +# We need to sent env PYTHON for python2 only build +%global export_waf_python export PYTHON=%{__python2} +%endif + +%if (0%{?with_python2} == 1 && 0%{?with_python3} == 1) +# python3 is default and therefore python2 need to be set as extra-python +%global extra_python --extra-python=%{__python2} +%endif + Name: libtdb Version: 1.3.17 Release: 1%{?dist} @@ -70,24 +80,20 @@ Python3 bindings for libtdb %autosetup -n tdb-%{version} -p1 %build -%if 0%{?with_python3} -PY3_CONFIG_FLAGS=--extra-python=%{__python3} -%else -PY3_CONFIG_FLAGS="" -%endif - +%{?export_waf_python} %configure --disable-rpath \ --bundled-libraries=NONE \ --builtin-libraries=replace \ - $PY3_CONFIG_FLAGS + %{?extra_python} make %{?_smp_mflags} V=1 %check +%{?export_waf_python} make %{?_smp_mflags} check %install - +%{?export_waf_python} make install DESTDIR=$RPM_BUILD_ROOT # Shared libraries need to be marked executable for