diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/meson/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/meson/rpath-0.58.patch | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index e96707f5a5..ea6dcf19cb 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -16,6 +16,8 @@ class Meson(PythonPackage): maintainers = ['michaelkuhn'] + version('0.58.0', sha256='991b882bfe4d37acc23c064a29ca209458764a580d52f044f3d50055a132bed4') + version('0.57.2', sha256='cd3773625253df4fd1c380faf03ffae3d02198d6301e7c8bc7bba6c66af66096') version('0.57.1', sha256='0c043c9b5350e9087cd4f6becf6c0d10b1d618ca3f919e0dcca2cdf342360d5d') version('0.57.0', sha256='fd26a27c1a509240c668ebd29d280649d9239cf8684ead51d5cb499d1e1188bd') version('0.56.2', sha256='aaae961c3413033789248ffe6762589e80b6cf487c334d0b808e31a32c48f35f') @@ -45,7 +47,8 @@ class Meson(PythonPackage): # are not reverted. patch('rpath-0.49.patch', when='@0.49:0.53') patch('rpath-0.54.patch', when='@0.54:0.55') - patch('rpath-0.56.patch', when='@0.56:') + patch('rpath-0.56.patch', when='@0.56:0.57') + patch('rpath-0.58.patch', when='@0.58:') executables = ['^meson$'] diff --git a/var/spack/repos/builtin/packages/meson/rpath-0.58.patch b/var/spack/repos/builtin/packages/meson/rpath-0.58.patch new file mode 100644 index 0000000000..9e35933ed9 --- /dev/null +++ b/var/spack/repos/builtin/packages/meson/rpath-0.58.patch @@ -0,0 +1,12 @@ +--- a/mesonbuild/scripts/depfixer.py 2021-05-11 21:50:38.800645669 +0200 ++++ b/mesonbuild/scripts/depfixer.py 2021-05-11 21:51:44.503883473 +0200 +@@ -479,6 +479,9 @@ + + def fix_rpath(fname: str, rpath_dirs_to_remove: T.Set[bytes], new_rpath: T.Union[str, bytes], final_path: str, install_name_mappings: T.Dict[str, str], verbose: bool = True) -> None: + global INSTALL_NAME_TOOL ++ # Do not strip rpath when run from within Spack ++ if 'SPACK_RPATH_DIRS' in os.environ: ++ return + # Static libraries, import libraries, debug information, headers, etc + # never have rpaths + # DLLs and EXE currently do not need runtime path fixing |