Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
Date: Sat, 16 Oct 2021 10:14:55
Message-Id: 1634379266.04eb86bc87e3a854927784268005115f021188bc.sam@gentoo
1 commit: 04eb86bc87e3a854927784268005115f021188bc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 10:14:26 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 10:14:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04eb86bc
7
8 dev-lang/ocaml: filter LTO, no strict aliasing in <4.12
9
10 Bug: https://bugs.gentoo.org/818445
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 5 +++++
14 dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 5 +++++
15 dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 5 +++++
16 dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 5 +++++
17 dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 5 +++++
18 5 files changed, 25 insertions(+)
19
20 diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
21 index 7604e5ba353..9ef969d018b 100644
22 --- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
23 +++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
24 @@ -66,6 +66,11 @@ src_configure() {
25 # Bug #285993
26 filter-mfpmath sse
27
28 + # Broken until 4.12
29 + # bug #818445
30 + filter-flags -flto
31 + append-flags -fno-strict-aliasing
32 +
33 # -ggdb3 & co makes it behave weirdly, breaks sexplib
34 replace-flags -ggdb* -ggdb
35
36
37 diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
38 index aab387a1042..707f584fb23 100644
39 --- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
40 +++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
41 @@ -67,6 +67,11 @@ src_configure() {
42 # Bug #285993
43 filter-mfpmath sse
44
45 + # Broken until 4.12
46 + # bug #818445
47 + filter-flags -flto
48 + append-flags -fno-strict-aliasing
49 +
50 # -ggdb3 & co makes it behave weirdly, breaks sexplib
51 replace-flags -ggdb* -ggdb
52
53
54 diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
55 index 23d27276013..b9f00b2cfe0 100644
56 --- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
57 +++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
58 @@ -28,6 +28,11 @@ src_prepare() {
59
60 cp "${FILESDIR}"/ocaml.conf "${T}" || die
61
62 + # Broken until 4.12
63 + # bug #818445
64 + filter-flags -flto
65 + append-flags -fno-strict-aliasing
66 +
67 # OCaml generates textrels on 32-bit arches
68 # We can't do anything about it, but disabling it means that tests
69 # for OCaml-based packages won't fail on unexpected output
70
71 diff --git a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
72 index 7203dec65d6..69ae1931963 100644
73 --- a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
74 +++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
75 @@ -26,6 +26,11 @@ src_prepare() {
76
77 cp "${FILESDIR}"/ocaml.conf "${T}" || die
78
79 + # Broken until 4.12
80 + # bug #818445
81 + filter-flags -flto
82 + append-flags -fno-strict-aliasing
83 +
84 # OCaml generates textrels on 32-bit arches
85 # We can't do anything about it, but disabling it means that tests
86 # for OCaml-based packages won't fail on unexpected output
87
88 diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
89 index 464822a6bd4..001fbf26fdf 100644
90 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
91 +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
92 @@ -26,6 +26,11 @@ src_prepare() {
93
94 cp "${FILESDIR}"/ocaml.conf "${T}" || die
95
96 + # Broken until 4.12
97 + # bug #818445
98 + filter-flags -flto
99 + append-flags -fno-strict-aliasing
100 +
101 # OCaml generates textrels on 32-bit arches
102 # We can't do anything about it, but disabling it means that tests
103 # for OCaml-based packages won't fail on unexpected output