diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-09 17:00:31 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-11 10:33:43 -0500 |
| commit | 5cc76f7d841fccfe2b2bdb4b4a4e540d6152f6d6 (patch) | |
| tree | 2605b025863ad65f718ec56718f5d29e88db4268 | |
| parent | 59ce0c751409af36c13da64843f4ee6d7d3419ef (diff) | |
| download | spack-5cc76f7d841fccfe2b2bdb4b4a4e540d6152f6d6.tar.gz spack-5cc76f7d841fccfe2b2bdb4b4a4e540d6152f6d6.tar.bz2 spack-5cc76f7d841fccfe2b2bdb4b4a4e540d6152f6d6.tar.xz spack-5cc76f7d841fccfe2b2bdb4b4a4e540d6152f6d6.zip | |
Fix patch for py-pyside 1.2.4
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyside/package.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index eda14660da..032ae50440 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -59,10 +59,12 @@ class PyPyside(Package): # PySide tries to patch ELF files to remove RPATHs # Disable this and go with the one we set. - filter_file( - r'^\s*rpath_cmd\(pyside_path, srcpath\)', - r'#rpath_cmd(pyside_path, srcpath)', - 'pyside_postinstall.py') + if self.spec.satisfies('@1.2.4:'): + rpath_file = 'setup.py' + else: + rpath_file = 'pyside_postinstall.py' + + filter_file(r'(^\s*)(rpath_cmd\(.*\))', r'\1#\2', rpath_file) def install(self, spec, prefix): python('setup.py', 'install', |