ctdb/packaging/RPM: don't use waf directly
authorStefan Metzmacher <metze@samba.org>
Mon, 28 Mar 2022 10:38:36 +0000 (12:38 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 29 Mar 2022 22:32:32 +0000 (22:32 +0000)
./configure && make && make install is will always work.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
ctdb/packaging/RPM/ctdb.spec.in

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