py-shiboken: fix build with new Python (#28464)

This commit is contained in:
Adam J. Stewart 2022-01-19 11:32:29 -06:00 committed by GitHub
parent 192f5cf66d
commit 5e351ffff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions

View File

@ -18,10 +18,13 @@ class PyShiboken(PythonPackage):
depends_on('cmake', type='build') depends_on('cmake', type='build')
depends_on("py-setuptools", type='build') depends_on("py-setuptools", type='build')
depends_on("py-sphinx", type=('build', 'run')) depends_on("py-sphinx@:3.4", type=('build', 'run'))
depends_on("libxml2") depends_on("libxml2")
depends_on("qt@:4.8") depends_on("qt@:4.8")
# subprocess.mswindows was renamed to subprocess._mswindows in Python 3.5
patch('python-3.5.patch', when='^python@3.5:')
def patch(self): def patch(self):
"""Undo Shiboken RPATH handling and add Spack RPATH.""" """Undo Shiboken RPATH handling and add Spack RPATH."""
# Add Spack's standard CMake args to the sub-builds. # Add Spack's standard CMake args to the sub-builds.

View File

@ -0,0 +1,20 @@
--- a/popenasync.py 2014-04-24 01:27:23.000000000 -0500
+++ b/popenasync.py 2022-01-19 11:11:09.000000000 -0600
@@ -23,7 +23,7 @@
else:
null_byte = '\x00'
-if subprocess.mswindows:
+if subprocess._mswindows:
if sys.version_info >= (3,):
# Test date should be in ascii.
def encode(s):
@@ -142,7 +142,7 @@
getattr(self, which).close()
setattr(self, which, None)
- if subprocess.mswindows:
+ if subprocess._mswindows:
def kill(self):
# Recipes
#http://me.in-berlin.de/doc/python/faq/windows.html#how-do-i-emulate-os-kill-in-windows