Control: tags 1006784 + pending
Control: forwarded 1006784 https://debbugs.gnu.org/54412

Dear maintainer,

I've prepared an NMU for automake-1.16 (versioned as 1:1.16.5-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

SR
diff -Nru automake-1.16-1.16.5/debian/changelog automake-1.16-1.16.5/debian/changelog
--- automake-1.16-1.16.5/debian/changelog	2021-11-11 07:46:00.000000000 -0400
+++ automake-1.16-1.16.5/debian/changelog	2022-03-15 20:13:57.000000000 -0400
@@ -1,3 +1,11 @@
+automake-1.16 (1:1.16.5-1.2) unstable; urgency=medium
+
+  * Non maintainer upload
+  * Patch: Fix search paths for new Python 3.10, use posix_prefix scheme.
+    (Closes: #1006784, LP: #1960608)
+
+ -- Stefano Rivera <[email protected]>  Tue, 15 Mar 2022 20:13:57 -0400
+
 automake-1.16 (1:1.16.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch
--- automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch	1969-12-31 20:00:00.000000000 -0400
+++ automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch	2022-03-15 20:13:43.000000000 -0400
@@ -0,0 +1,52 @@
+Subject: [PATCH] python: use the posix_prefix sysconfig scheme on Debian
+
+Fixes Debian's bug: https://bugs.debian.org/1006784
+
+Debian adds a custom sysconfig scheme to system python installs,
+"posix_local". This is the default scheme, and it redirects local users'
+Python module installs to /usr/local even though Python is installed
+with a /usr prefix. Both are on Debian's python's sys.path module search
+path.
+
+Automake and its users understand prefixes, and are likely to select
+/usr/local, explicitly. Select the "posix_prefix" scheme, with the
+user-supplied prefix.
+
+Previously this custom sysconfig scheme was specified in
+distutils.sysconfig, but not sysconfig itself. As distutils is being
+deprecated, the custom scheme is now specified in sysconfig, since
+Debian's Python 3.10 (3.10.2-4).
+
+Author: Gianfranco Costamagna <[email protected]>
+Bug-Debian: https://bugs.debian.org/1006784
+Forwarded: http://debbugs.gnu.org/54412
+Last-Update: 2022-03-15
+
+--- automake-1.16-1.16.5.orig/m4/python.m4
++++ automake-1.16-1.16.5/m4/python.m4
+@@ -255,7 +255,11 @@ except ImportError:
+    am_cv_python_pythondir=`$PYTHON -c "
+ $am_python_setup_sysconfig
+ if can_use_sysconfig:
+-  sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
++  scheme = sysconfig.get_default_scheme()
++  if scheme == 'posix_local':
++    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
++    scheme = 'posix_prefix'
++  sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
+ else:
+   from distutils import sysconfig
+   sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+@@ -297,7 +301,11 @@ sys.stdout.write(sitedir)"`
+    am_cv_python_pyexecdir=`$PYTHON -c "
+ $am_python_setup_sysconfig
+ if can_use_sysconfig:
+-  sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
++  scheme = sysconfig.get_default_scheme()
++  if scheme == 'posix_local':
++    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
++    scheme = 'posix_prefix'
++  sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
+ else:
+   from distutils import sysconfig
+   sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
diff -Nru automake-1.16-1.16.5/debian/patches/series automake-1.16-1.16.5/debian/patches/series
--- automake-1.16-1.16.5/debian/patches/series	2021-11-11 07:46:00.000000000 -0400
+++ automake-1.16-1.16.5/debian/patches/series	2022-03-15 19:03:50.000000000 -0400
@@ -2,3 +2,4 @@
 0002-Drop-SHELL.patch
 0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch
 python3.10.patch
+python3.10-sysconfig.patch

Reply via email to