[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: d/rules: support "terse" build option for non-verbose build

[Michael Tokarev (@mjt)]

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


Commits:
4908bdfa by Michael Tokarev at 2022-11-05T18:00:34+03:00
d/rules: support "terse" build option for non-verbose build

- - - - -
b8d09810 by Michael Tokarev at 2022-11-06T20:00:22+03:00
d/rules: remove third_party/heimdal/lib/gssapi/gssapi.h (#1013205)

https://lists.samba.org/archive/samba-technical/2022-November/137788.html
This fixes the <gssapi/gssapi.h> vs -I search path mess, fixes ftbfs on sparc64

- - - - -
50f3bbb8 by Michael Tokarev at 2022-11-06T20:13:40+03:00
update changelog; upload 4.17.2+dfsg-9 to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+samba (2:4.17.2+dfsg-9) unstable; urgency=medium
+
+  * hurd-compat.patch: some minor compatibility tweaks for hurd
+  * d/rules compat work:
+    - ceph is linux-only like glusterfs
+    - d/rules: add another conditional, with_snapper
+    - combine linux features into single block
+  * d/rules: support "terse" build option for non-verbose build
+  * d/rules: remove third_party/heimdal/lib/gssapi/gssapi.h before build
+    (Closes: #1013205). This fixes -I path order and <gssapi/gssapi.h>
+    include mess which caused samba to FTBFS on sparc64 for quite some time
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sun, 06 Nov 2022 20:13:19 +0300
+
 samba (2:4.17.2+dfsg-8) unstable; urgency=medium
 
   * d/rules: do not explicitly enable quotas on non-linux:


=====================================
debian/rules
=====================================
@@ -10,7 +10,7 @@ endif
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/vendor.mk
-V = 1
+V = $(if $(filter terse, ${DEB_BUILD_OPTIONS}),,1)
 WAF = PYTHONHASHSEED=1 ./buildtools/bin/waf \
 	$(if $(filter parallel=%,${DEB_BUILD_OPTIONS}),\
 	  $(patsubst parallel=%,-j%,$(filter parallel=%,${DEB_BUILD_OPTIONS})))
@@ -120,6 +120,8 @@ bin/configured.stamp:
 	  { $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
 # #1021371: we only need the single "version" symbol LDB_2.4.4 in the library
 	touch ${EXTRA_ABI_VERSION_FILES}
+# #1013205: https://lists.samba.org/archive/samba-technical/2022-November/137788.html
+	rm -f third_party/heimdal/lib/gssapi/gssapi.h
 	touch $@
 
 build-arch: bin/built.stamp



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d119a30ed3019c362f570272351e2514b2277b3f...50f3bbb8a1b625d3bee5d47acc2915b61071a76b

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d119a30ed3019c362f570272351e2514b2277b3f...50f3bbb8a1b625d3bee5d47acc2915b61071a76b
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/20221106/1e9d69a9/attachment-0001.htm>