diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2022-11-15 14:42:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 12:42:11 -0700 |
| commit | 4ecb6ecaffc35cd9e5f45a2fa47a8c38064ab317 (patch) | |
| tree | 613271fc0f6bbdcd124794d81607d3544f72472a /var | |
| parent | d5193f73d8b700e9c36dca82b92cde78d77454dc (diff) | |
| download | spack-4ecb6ecaffc35cd9e5f45a2fa47a8c38064ab317.tar.gz spack-4ecb6ecaffc35cd9e5f45a2fa47a8c38064ab317.tar.bz2 spack-4ecb6ecaffc35cd9e5f45a2fa47a8c38064ab317.tar.xz spack-4ecb6ecaffc35cd9e5f45a2fa47a8c38064ab317.zip | |
meson: add new version 0.64.0 (#33880)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/meson/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/meson/rpath-0.64.patch | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index ecec502651..29b32eae7e 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -18,6 +18,7 @@ class Meson(PythonPackage): maintainers = ["eli-schwartz", "michaelkuhn"] + version("0.64.0", sha256="6477993d781b6efea93091616a6d6a0766c0e026076dbeb11249bf1c9b49a347") version("0.63.3", sha256="7c516c2099b762203e8a0a22412aa465b7396e6f9b1ab728bad6e6db44dc2659") version("0.63.2", sha256="023a3f7c74e68991154c3205a6975705861eedbf8130e013d15faa1df1af216e") version("0.63.1", sha256="f355829f0e8c714423f03a06604c04c216d4cbe3586f3154cb2181076b19207a") @@ -66,12 +67,13 @@ class Meson(PythonPackage): 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:0.57") - patch("rpath-0.58.patch", when="@0.58:") + patch("rpath-0.58.patch", when="@0.58:0.63") + patch("rpath-0.64.patch", when="@0.64:") # Intel OneAPI compiler support # https://github.com/mesonbuild/meson/pull/10909 # https://github.com/mesonbuild/meson/pull/9850 - patch("oneapi.patch", when="@0.62: %oneapi") + patch("oneapi.patch", when="@0.62:0.63 %oneapi") executables = ["^meson$"] diff --git a/var/spack/repos/builtin/packages/meson/rpath-0.64.patch b/var/spack/repos/builtin/packages/meson/rpath-0.64.patch new file mode 100644 index 0000000000..df69287c19 --- /dev/null +++ b/var/spack/repos/builtin/packages/meson/rpath-0.64.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 # pylint: disable=global-statement ++ # 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 |