[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: d/rules, d/control: only build glusterfs support on 64bits (#1041996, #1039604)

[Michael Tokarev (@mjt)]

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


Commits:
909f0eb8 by Michael Tokarev at 2023-07-26T07:41:39+03:00
d/rules, d/control: only build glusterfs support on 64bits (#1041996, #1039604)

- - - - -
55c74e3b by Michael Tokarev at 2023-07-26T07:42:46+03:00
d/rules: make ceph conditional similar to gluster

- - - - -
03df070c by Michael Tokarev at 2023-08-04T17:26:56+03:00
d/rules: wrap _PYTHON_SYSCONFIGDATA_NAME setting to cross-compile case

On e.g. buster, _PYTHON_SYSCONFIGDATA_NAME is different, so this assignment
does not work right.  In order for it to work on buster, add condition on
host vs build gnu type. This breaks compilation with foreign python binary.

- - - - -
7de94122 by Michael Tokarev at 2023-08-04T17:28:40+03:00
d/control: fix description of samba-common-bin (samba-client)

- - - - -
594f6c07 by Michael Tokarev at 2023-08-04T17:29:09+03:00
update changelog; upload version 4.18.5+dfsg-2 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+samba (2:4.18.5+dfsg-2) unstable; urgency=medium
+
+  * d/rules, d/control: only build glusterfs support on 64bits
+    (Closes: #1041996)
+  * d/rules: make ceph conditional similar to gluster
+  * d/rules: wrap _PYTHON_SYSCONFIGDATA_NAME setting to cross-compile case
+    On e.g. buster, _PYTHON_SYSCONFIGDATA_NAME is different, so this assignment
+    does not work right.  In order for it to work on buster, add condition on
+    host vs build gnu type. This breaks compilation with foreign python binary.
+  * d/control: fix description of samba-common-bin (samba-client)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Fri, 04 Aug 2023 17:29:06 +0300
+
 samba (2:4.18.5+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/security release 4.18.5, including:


=====================================
debian/control
=====================================
@@ -39,7 +39,7 @@ Build-Depends-Arch:
 	libcmocka-dev (>= 1.1.3),
 	libcups2-dev,
 	libdbus-1-dev,
-	libglusterfs-dev [linux-any],
+	libglusterfs-dev [amd64 arm64 ppc64el ppc64 riscv64 mips64el s390x ia64 sparc64],
 	libgnutls28-dev,
 	libgpgme11-dev,
 	libicu-dev,
@@ -183,8 +183,8 @@ Description: Samba common files used by both the server and the client
  or member server in Active Directory or NT4-style domains.
  .
  This package contains the common files that are used by both the server
- (provided in the samba package) and the client (provided in the samba-clients
- package).
+ (provided in the samba package) and the client (provided in the smbclient
+ libsmbclient packages).
 
 Package: samba-ad-dc
 Architecture: all


=====================================
debian/rules
=====================================
@@ -15,9 +15,11 @@ WAF := PYTHONHASHSEED=1 ./buildtools/bin/waf \
 	$(patsubst parallel=%,-j%,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
 
 ifeq (linux,${DEB_HOST_ARCH_OS})
+ifneq (${DEB_HOST_GNU_TYPE},${DEB_BUILD_GNU_TYPE})
 # for cross-build or build with foreign python binary (it is _gnu0_i386-gnu on hurd)
 export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}
 endif
+endif
 
 DESTDIR = ${CURDIR}/debian/tmp
 
@@ -75,15 +77,10 @@ config-args = \
 	--with-logdir=/var/log/ctdb \
 
 ifeq (${DEB_HOST_ARCH_OS}, linux) # extra linux-specific features
-with-glusterfs = yes
-with-ceph = yes
+with-glusterfs = $(if $(filter amd64 arm64 ppc64el ppc64 riscv64 mips64el s390x ia64 sparc64,${DEB_HOST_ARCH}),yes)
+with-ceph = $(if $(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x, ${DEB_HOST_ARCH}),yes)
 with-snapper = yes
 
-# Ceph is not available on all platforms
-ifeq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x, ${DEB_HOST_ARCH}))
-with-ceph =
-endif
-
 config-args += \
 	--with-quota \
 	\
@@ -100,8 +97,6 @@ endif
 # Ubuntu i386 binary compatibility only effort: Disable some i386 packages and modules
 ifeq (${DEB_VENDOR}-${DEB_HOST_ARCH}, Ubuntu-i386)
 omit-pkgs += ctdb libpam-winbind samba samba-testsuite samba-vfs-modules
-with-ceph =
-with-glusterfs =
 endif
 
 ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/732b3f26ec13b17c9f17a77297529d5f02e9eab1...594f6c07383302574a8468c007c8d0c2e8fc10ed

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/732b3f26ec13b17c9f17a77297529d5f02e9eab1...594f6c07383302574a8468c007c8d0c2e8fc10ed
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/20230804/e9a58891/attachment-0001.htm>