diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-01-19 11:32:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 10:32:29 -0700 |
| commit | 5e351ffff42cf204daada2bd6d512ca1b2b4498c (patch) | |
| tree | cc83b5235b94c007cef28469dbecdef5f0f3519a | |
| parent | 192f5cf66d835969f8e6a9fd29fb1542ae8272da (diff) | |
| download | spack-5e351ffff42cf204daada2bd6d512ca1b2b4498c.tar.gz spack-5e351ffff42cf204daada2bd6d512ca1b2b4498c.tar.bz2 spack-5e351ffff42cf204daada2bd6d512ca1b2b4498c.tar.xz spack-5e351ffff42cf204daada2bd6d512ca1b2b4498c.zip | |
py-shiboken: fix build with new Python (#28464)
| -rw-r--r-- | var/spack/repos/builtin/packages/py-shiboken/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-shiboken/python-3.5.patch | 20 |
2 files changed, 24 insertions, 1 deletions
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
|