From 1b633e1ca4f87d940138f44da7b7ad723c8d4756 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Tue, 14 Sep 2021 09:34:57 +0200 Subject: ocaml: add patch for clang@11: (#25886) --- var/spack/repos/builtin/packages/ocaml/package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index e3aa2a4d14..5f7fe77cfd 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -27,6 +27,11 @@ class Ocaml(Package): version('4.03.0', sha256='7fdf280cc6c0a2de4fc9891d0bf4633ea417046ece619f011fd44540fcfc8da2') patch('fix-duplicate-defs.patch', when="@4.08.0:4.09.0 %gcc@10.0:") + # #9969, #9981: Added mergeable flag to ELF sections containing mergeable + # constants. Fixes compatibility with the integrated assembler in clang 11.0.0. + # (Jacob Young, review by Nicolas Ojeda Bar) + patch('https://patch-diff.githubusercontent.com/raw/ocaml/ocaml/pull/9981.patch', + sha256='3b1ca67eb124f5460a077d9575f579ef9d2f0416424761ae9d6c701550c5b75b', when="@:4.11.0 %clang@11:") depends_on('ncurses') sanity_check_file = ['bin/ocaml'] -- cgit v1.2.3-70-g09d2