sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-packaging: Call waf with python wrapper

Browse Source 
This allows to build packages even when python3 is not available by
setting PYTHON variable.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2018-12-18 11:03:51 +11:00 committed by Amitay Isaacs
parent 9912709eca
commit 4443124fe8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ctdb/packaging/RPM/ctdb.spec.in
View File

@ -87,7 +87,8 @@ fi
export CC export CC
CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" \
$PYTHON ./buildtools/bin/waf configure \
--builtin-libraries=replace,popt \ --builtin-libraries=replace,popt \
--bundled-libraries=!talloc,!tevent,!tdb \ --bundled-libraries=!talloc,!tevent,!tdb \
--minimum-library-version=talloc:%libtalloc_version,tdb:%libtdb_version,tevent:%libtevent_version \ --minimum-library-version=talloc:%libtalloc_version,tdb:%libtdb_version,tevent:%libtevent_version \
@ -102,7 +103,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--localstatedir=%{_localstatedir} --localstatedir=%{_localstatedir}
./buildtools/bin/waf build $PYTHON ./buildtools/bin/waf build
%install %install
# Clean up in case there is trash left from a previous build # Clean up in case there is trash left from a previous build
@ -111,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
# Create the target build directory hierarchy # Create the target build directory hierarchy
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d
DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install DESTDIR=$RPM_BUILD_ROOT $PYTHON ./buildtools/bin/waf install
install -m644 config/ctdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb install -m644 config/ctdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
install -m644 config/ctdb.tunables $RPM_BUILD_ROOT%{_sysconfdir}/ctdb install -m644 config/ctdb.tunables $RPM_BUILD_ROOT%{_sysconfdir}/ctdb