[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: d/rules: output whole config.log in case of configure failure

[Michael Tokarev (@mjt)]

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


Commits:
dfdd0508 by Michael Tokarev at 2022-04-03T08:13:53+03:00
d/rules: output whole config.log in case of configure failure

We have a package build failure due to configure not finding setreuid
first, but failing later trying to find a replacement, so we have to
look at the config.log for a prior stage.

Just show everything, but only in non-verbose mode.

- - - - -
6fdfa22a by Michael Tokarev at 2022-04-03T08:34:11+03:00
silence-waf-uselib_local.diff

this removes about 2k repetitions of
 compat: "uselib_local" is deprecated, replace by "use"
warning from the build log, for now.

- - - - -


3 changed files:

- debian/patches/series
- + debian/patches/silence-waf-uselib_local.diff
- debian/rules


Changes:

=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@ weak-crypto-allowed-clarify.diff
 spelling.patch
 waf-add-support-for-GNU-kFreeBSD.patch
 ctdb_etcd_lock-path.patch
+silence-waf-uselib_local.diff


=====================================
debian/patches/silence-waf-uselib_local.diff
=====================================
@@ -0,0 +1,31 @@
+Subject: silence uselib_local warning produced by waf
+From: Michael Tokarev <mjt at tls.msk.ru>
+Date: Sun, 03 Apr 2022 07:57:38 +0300
+
+During config/build process in verbose mode, waf produces
+about 2k repetitions of this warning:
+
+  compat: "uselib_local" is deprecated, replace by "use"
+
+which clutters the build log.
+
+Comment this warning out for now until it will be
+fixed properly.
+
+diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py
+index e2a078bd3a0..dfd53a012d1 100644
+--- a/buildtools/wafsamba/samba_waf18.py
++++ b/buildtools/wafsamba/samba_waf18.py
+@@ -314,9 +314,9 @@ def apply_uselib_local(self):
+     seen = set()
+     seen_uselib = set()
+     tmp = Utils.deque(names) # consume a copy of the list of names
+-    if tmp:
+-        if Logs.verbose:
+-            Logs.warn('compat: "uselib_local" is deprecated, replace by "use"')
++    #if tmp:
++    #    if Logs.verbose:
++    #        Logs.warn('compat: "uselib_local" is deprecated, replace by "use"')
+     while tmp:
+         lib_name = tmp.popleft()
+         # visit dependencies only once


=====================================
debian/rules
=====================================
@@ -137,7 +137,7 @@ clean install install-arch install-indep: %:
 
 override_dh_auto_configure:
 	${WAF_CMD} -j 1 configure ${conf_args} || \
-	  { echo "== last 20 lines of config.log:"; tail -n20 bin/config.log; false; }
+	  { $(if ${V},echo "==== contents of config.log:"; cat 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/-/compare/b1897627800cc8ad807792025f12fc0c98a17e05...6fdfa22a2aa1fd3d6662381b17bbaebce68eb66e

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/b1897627800cc8ad807792025f12fc0c98a17e05...6fdfa22a2aa1fd3d6662381b17bbaebce68eb66e
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/20220403/181c4ca0/attachment-0001.htm>