Remove python2 code for building on RHEL
Samba has python3 support now.
This commit is contained in:
parent
a5b527fe93
commit
507f87a34c
14
samba.spec
14
samba.spec
@ -775,12 +775,6 @@ export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
|
|||||||
# Use the gold linker
|
# Use the gold linker
|
||||||
export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
|
export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
|
||||||
|
|
||||||
%if 0%{?rhel}
|
|
||||||
# Use Python 2 for the waf buildscript
|
|
||||||
pathfix.py -n -p -i %{__python2} buildtools/bin/waf
|
|
||||||
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
|
||||||
%endif # rhel
|
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--enable-fhs \
|
--enable-fhs \
|
||||||
--with-piddir=/run \
|
--with-piddir=/run \
|
||||||
@ -833,10 +827,6 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%if 0%{?rhel}
|
|
||||||
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
|
||||||
%endif # rhel
|
|
||||||
|
|
||||||
make %{?_smp_mflags} install DESTDIR=%{buildroot}
|
make %{?_smp_mflags} install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
install -d -m 0755 %{buildroot}/usr/{sbin,bin}
|
install -d -m 0755 %{buildroot}/usr/{sbin,bin}
|
||||||
@ -1003,10 +993,6 @@ done
|
|||||||
|
|
||||||
%if %{with testsuite}
|
%if %{with testsuite}
|
||||||
%check
|
%check
|
||||||
%if 0%{?rhel}
|
|
||||||
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
|
||||||
%endif # rhel
|
|
||||||
|
|
||||||
TDB_NO_FSYNC=1 make %{?_smp_mflags} test
|
TDB_NO_FSYNC=1 make %{?_smp_mflags} test
|
||||||
%endif # with testsuite
|
%endif # with testsuite
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user