[Pkg-samba-maint] [Git][samba-team/samba][experimental] 2 commits: d/rules: wrap _PYTHON_SYSCONFIGDATA_NAME setting to cross-compile case

[Michael Tokarev (@mjt)]

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


Commits:
e1109d79 by Michael Tokarev at 2023-08-04T14:29:07+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.

- - - - -
eda0f93e by Michael Tokarev at 2023-08-04T14:30:10+03:00
update changelog; upload version 4.19.0~rc1+dfsg-3 to experimental

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+samba (2:4.19.0~rc1+dfsg-3) experimental; urgency=medium
+
+  * 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.
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Fri, 04 Aug 2023 14:30:04 +0300
+
 samba (2:4.19.0~rc1+dfsg-2) experimental; urgency=medium
 
   * d/samba-libs.install, d/samba.install, d/control:


=====================================
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
 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f952861968762da73fc6fbf9445dad1bb3691195...eda0f93e3b14ef71f7dfa971548ebbe2d2411ddf

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f952861968762da73fc6fbf9445dad1bb3691195...eda0f93e3b14ef71f7dfa971548ebbe2d2411ddf
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/63313825/attachment-0001.htm>