Package: dh-python
Version: 4.20200804
Tags: patch
User: [email protected]
Usertags: ftcbfs
Control: affects -1 + src:libpillowfight
Unfortunately, _PYTHON_SYSCONFIGDATA_NAME is wrong again. This time, the
relevant .py file is provided under both locations for the regular
libpython. Unfortunately, this does not cover the libpythonX.Y-dbg
variant.
$ apt-file search _sysconfigdata
libpython2.7-dbg: /usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_d.py
libpython2.7-minimal: /usr/lib/python2.7/_sysconfigdata.py
libpython2.7-minimal:
/usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py
libpython3.8-dbg: /usr/lib/python3.8/_sysconfigdata_d_x86_64-linux-gnu.py
libpython3.8-minimal: /usr/lib/python3.8/_sysconfigdata__x86_64-linux-gnu.py
libpython3.8-stdlib:
/usr/lib/python3.8/_sysconfigdata__linux_x86_64-linux-gnu.py
libpython3.9-dbg: /usr/lib/python3.9/_sysconfigdata_d_x86_64-linux-gnu.py
libpython3.9-minimal: /usr/lib/python3.9/_sysconfigdata__x86_64-linux-gnu.py
libpython3.9-stdlib:
/usr/lib/python3.9/_sysconfigdata__linux_x86_64-linux-gnu.py
pypy-lib: /usr/lib/pypy/lib_pypy/_sysconfigdata.py
pypy3-lib: /usr/lib/pypy3/lib_pypy/_sysconfigdata.py
$
As you can see, it is provided as
_sysconfigdata__{DEB_HOST_ARCH_OS}_{DEB_HOST_MULTIARCH} and as
_sysconfigdata__{DEB_HOST_MULTIARCH} for the non-debug variant, but only
the latter for the debug variant.
Therefore, we need to change the computation again. I don't think adding
backwards compatibility for older releases of Python is useful. So I'm
just attaching the patch to make this happen. Please consider applying
it.
Helmut
diff --minimal -Nru dh-python-4.20200804/debian/changelog
dh-python-4.20200804+nmu1/debian/changelog
--- dh-python-4.20200804/debian/changelog 2020-08-04 10:10:12.000000000
+0200
+++ dh-python-4.20200804+nmu1/debian/changelog 2020-08-10 23:37:36.000000000
+0200
@@ -1,3 +1,10 @@
+dh-python (4.20200804+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix _PYTHON_SYSCONFIGDATA_NAME again. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Mon, 10 Aug 2020 23:37:36 +0200
+
dh-python (4.20200804) unstable; urgency=medium
[ Scott Kitterman ]
diff --minimal -Nru dh-python-4.20200804/pybuild
dh-python-4.20200804+nmu1/pybuild
--- dh-python-4.20200804/pybuild 2020-03-15 21:00:31.000000000 +0100
+++ dh-python-4.20200804+nmu1/pybuild 2020-08-10 23:37:27.000000000 +0200
@@ -81,8 +81,7 @@
if arch_data['DEB_BUILD_ARCH'] != arch_data['DEB_HOST_ARCH']:
# support cross compiling Python 3.X extensions, see #892931
env.setdefault('_PYTHON_SYSCONFIGDATA_NAME',
- ('_sysconfigdata__{DEB_HOST_ARCH_OS}'
- '_{DEB_HOST_MULTIARCH}').format(**arch_data))
+ '_sysconfigdata__' +
arch_data["DEB_HOST_MULTIARCH"])
if cfg.system:
certainty = 99
