[Pkg-samba-maint] [Git][samba-team/samba][master] d/rules: make configure non-verbose and output end of bin/config.log on error

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
b1897627 by Michael Tokarev at 2022-04-03T01:01:45+03:00
d/rules: make configure non-verbose and output end of bin/config.log on error

waf -v is *too* verbose at least for configure, it just
makes whole errors nearly impossible to spot and the things
it prints aren't useful.  On the other hand, it keeps
quite detailed bin/config.log file where actual useful
information is collected.  So run configure in non-verbose
(and non-parallel) mode, and print last 20 errors from
bin/config.log if configure run failed.  This makes things
*much* easier to debug.

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -35,8 +35,8 @@ debian/ldb-version.mk: lib/ldb/wscript
 include debian/ldb-version.mk
 
 V = 1
-WAF := PYTHONHASHSEED=1 $(PYTHON) ./buildtools/bin/waf $(if ${V},-v)
-WAF_NO_PARALLEL := $(WAF) -j 1
+WAF_CMD := PYTHONHASHSEED=1 ${PYTHON} ./buildtools/bin/waf
+WAF := ${WAF_CMD} $(if ${V},-v)
 
 # wrapper around cups-config, to work around #726726
 export PATH:=$(CURDIR)/debian/bin:$(PATH)
@@ -136,7 +136,8 @@ clean install install-arch install-indep: %:
 	dh $* --with python3 $(BUILD_PACKAGES)
 
 override_dh_auto_configure:
-	$(WAF_NO_PARALLEL) configure $(conf_args)
+	${WAF_CMD} -j 1 configure ${conf_args} || \
+	  { echo "== last 20 lines of config.log:"; tail -n20 bin/config.log; false; }
 
 override_dh_auto_build:
 # samba build system is designed so that default build (what is produced



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/b1897627800cc8ad807792025f12fc0c98a17e05

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/b1897627800cc8ad807792025f12fc0c98a17e05
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20220402/ad099913/attachment.htm>