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:32:01
Message-Id: 1634380302.a491173ff44e4981d6cdaf9f0856cb23a45393ec.sam@gentoo
1 commit: a491173ff44e4981d6cdaf9f0856cb23a45393ec
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 10:31:42 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 10:31:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a491173f
7
8 dev-lang/ocaml: filter -flto* too
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 2 +-
13 dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 2 +-
14 dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 4 ++--
15 dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 2 +-
16 dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +-
17 5 files changed, 6 insertions(+), 6 deletions(-)
18
19 diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
20 index 9ef969d018b..68a369bcebf 100644
21 --- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
22 +++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
23 @@ -68,7 +68,7 @@ src_configure() {
24
25 # Broken until 4.12
26 # bug #818445
27 - filter-flags -flto
28 + filter-flags '-flto*'
29 append-flags -fno-strict-aliasing
30
31 # -ggdb3 & co makes it behave weirdly, breaks sexplib
32
33 diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
34 index 707f584fb23..4c2da17dac5 100644
35 --- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
36 +++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
37 @@ -69,7 +69,7 @@ src_configure() {
38
39 # Broken until 4.12
40 # bug #818445
41 - filter-flags -flto
42 + filter-flags '-flto*'
43 append-flags -fno-strict-aliasing
44
45 # -ggdb3 & co makes it behave weirdly, breaks sexplib
46
47 diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
48 index b9f00b2cfe0..68b58ca86b1 100644
49 --- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
50 +++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
51 @@ -21,7 +21,7 @@ BDEPEND="${RDEPEND}
52 PDEPEND="emacs? ( app-emacs/ocaml-mode )
53 xemacs? ( app-xemacs/ocaml )"
54
55 -PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
56 +PATCHES=( "${FILESDIR}"/${PN}-4.09.0-gcc-10.patch )
57
58 src_prepare() {
59 default
60 @@ -30,7 +30,7 @@ src_prepare() {
61
62 # Broken until 4.12
63 # bug #818445
64 - filter-flags -flto
65 + filter-flags '-flto*'
66 append-flags -fno-strict-aliasing
67
68 # OCaml generates textrels on 32-bit arches
69
70 diff --git a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
71 index 69ae1931963..3b6334a9c87 100644
72 --- a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
73 +++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
74 @@ -28,7 +28,7 @@ src_prepare() {
75
76 # Broken until 4.12
77 # bug #818445
78 - filter-flags -flto
79 + filter-flags '-flto*'
80 append-flags -fno-strict-aliasing
81
82 # OCaml generates textrels on 32-bit arches
83
84 diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
85 index 001fbf26fdf..e965a0afa51 100644
86 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
87 +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
88 @@ -28,7 +28,7 @@ src_prepare() {
89
90 # Broken until 4.12
91 # bug #818445
92 - filter-flags -flto
93 + filter-flags '-flto*'
94 append-flags -fno-strict-aliasing
95
96 # OCaml generates textrels on 32-bit arches