[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/control: samba: depends on exact version of python3-samba

[Michael Tokarev (@mjt)]

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


Commits:
e43f5ed7 by Michael Tokarev at 2023-01-27T23:46:51+03:00
d/control: samba: depends on exact version of python3-samba

Just to be explicit, it does not change anything as both
depends on the same version of samba-libs.

- - - - -
08bb41f9 by Michael Tokarev at 2023-01-27T23:47:14+03:00
d/control: fix typo

- - - - -
1b5efe5a by Michael Tokarev at 2023-01-27T23:47:14+03:00
more tweaks for foreign/cross build

- do not depend on python3:any (already included in python3-dev)
- set _PYTHON_SYSCONFIGDATA_NAME only on linux (it is different on hurd)
- export PYTHON and host PYTHON_CONFIG to ./configure
- use ${DEB_HOST_MULTIARCH}-python3-config (instead of DEB_HOST_GNU_TYPE),
  this works on hurd too

- - - - -
909fc530 by Michael Tokarev at 2023-01-28T18:22:52+03:00
d/control: work around autodep8 #904999 again

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -60,9 +60,8 @@ Build-Depends-Arch:
 	liburing-dev [linux-any] <!pkg.samba.nouring>,
 	xfslibs-dev [linux-any],
 	zlib1g-dev (>= 1:1.2.3),
-# python:
-	python3:any,
-	python3-dev:any, libpython3-dev,
+# python (+#904999):
+	python3-dev:any | python3-dev, libpython3-dev,
 	python3-dnspython,
 	python3-etcd,
 	python3-markdown,
@@ -87,7 +86,7 @@ Depends: passwd,
          procps,
          python3,
          python3-dnspython,
-         python3-samba,
+         python3-samba (= ${binary:Version}),
          samba-common (= ${source:Version}),
          samba-common-bin (=${binary:Version}),
          tdb-tools,
@@ -194,7 +193,7 @@ Depends: samba (>= ${binary:Version}), samba-dsdb-modules, samba-vfs-modules,
 	krb5-kdc (>> 1.19.0) <pkg.samba.mitkrb5>,
 	${misc:Depends}
 Recommends: libnss-winbind, libpam-winbind,
-# samba-ad-provision is needed for settup only
+# samba-ad-provision is needed for setup only
 	samba-ad-provision
 Breaks: samba-ad-provision (<< ${source:Upstream-Version})
 Description: Samba control files to run AD Domain Controller


=====================================
debian/rules
=====================================
@@ -14,8 +14,10 @@ V := $(if $(filter terse, ${DEB_BUILD_OPTIONS}),,1)
 WAF := PYTHONHASHSEED=1 ./buildtools/bin/waf \
 	$(patsubst parallel=%,-j%,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
 
-# for cross-build or build with foreign python binary
-export _PYTHON_SYSCONFIGDATA_NAME = _sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}
+ifeq (linux,${DEB_HOST_ARCH_OS})
+# 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
 
 DESTDIR = ${CURDIR}/debian/tmp
 
@@ -146,6 +148,7 @@ bin/configured.stamp:
 	fi
 	CC="${CC}" CPP="${CPP}" LD="${LD}" PKGCONFIG="${PKG_CONFIG}" \
 	CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+	PYTHON=python3 PYTHON_CONFIG=${DEB_HOST_MULTIARCH}-python3-config \
 	    ${WAF} -j1 -C configure ${config-args} || \
 	  { $(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
@@ -324,7 +327,7 @@ execute_after_dh_fixperms-arch:
 override_dh_makeshlibs:
 	# generate symbols file with correct cpython suffix in there
 	{ \
-	    suff=$$(${DEB_HOST_GNU_TYPE}-python3-config --extension-suffix | tr _ -); \
+	    suff=$$(${DEB_HOST_MULTIARCH}-python3-config --extension-suffix | tr _ -); \
 	    SUFF=$$(echo "$${suff%.so}" | tr a-z- A-Z_); \
 	    echo "libpyldb-util$${suff}.2 python3-ldb #MINVER#"; \
 	    echo "* Build-Depends-Package: python3-ldb-dev" ; \



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/b162031e6420c7d452f3c41044c365148274d9b9...909fc5309ea35062d9d87a45330b44269cdec66b

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/b162031e6420c7d452f3c41044c365148274d9b9...909fc5309ea35062d9d87a45330b44269cdec66b
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/20230128/8ab4579f/attachment-0001.htm>