From 260dfd3f8e1275002224ee8545622678fb6df8d0 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 17 Jan 2019 21:34:04 +0100 Subject: [PATCH] Update python2/3 builds --- libtevent.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/libtevent.spec b/libtevent.spec index e36fba5..9a9747f 100644 --- a/libtevent.spec +++ b/libtevent.spec @@ -8,6 +8,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 + %global talloc_version 2.1.15 Name: libtevent @@ -92,27 +102,22 @@ UpdateTimestamps() { %autosetup -n tevent-%{version} -p1 %build - -%if 0%{?with_python3} -export PY3_CONFIG_FLAGS=--extra-python=%{__python3} -%else -export 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 doxygen doxy.config %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