From 5e351ffff42cf204daada2bd6d512ca1b2b4498c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 19 Jan 2022 11:32:29 -0600 Subject: py-shiboken: fix build with new Python (#28464) --- .../repos/builtin/packages/py-shiboken/package.py | 5 ++++- .../builtin/packages/py-shiboken/python-3.5.patch | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/py-shiboken/python-3.5.patch diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index 5734d50340..971ee93334 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -18,10 +18,13 @@ class PyShiboken(PythonPackage): depends_on('cmake', 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("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): """Undo Shiboken RPATH handling and add Spack RPATH.""" # Add Spack's standard CMake args to the sub-builds. diff --git a/var/spack/repos/builtin/packages/py-shiboken/python-3.5.patch b/var/spack/repos/builtin/packages/py-shiboken/python-3.5.patch new file mode 100644 index 0000000000..61de88c468 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-shiboken/python-3.5.patch @@ -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 -- cgit v1.2.3-70-g09d2