Gentoo Archives: gentoo-commits

From: "Maciej Barć" <xgqt@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/haxe/
Date: Sun, 05 Dec 2021 20:41:31
Message-Id: 1638736882.229147d070a9c5d32533e577029dfe661edaaef1.xgqt@gentoo
1 commit: 229147d070a9c5d32533e577029dfe661edaaef1
2 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 5 20:40:06 2021 +0000
4 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 5 20:41:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229147d0
7
8 dev-lang/haxe: make - ensure correct ocamlopt(.opt)
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
12
13 dev-lang/haxe/{haxe-4.2.4-r1.ebuild => haxe-4.2.4-r2.ebuild} | 7 ++++++-
14 1 file changed, 6 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-lang/haxe/haxe-4.2.4-r1.ebuild b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
17 similarity index 91%
18 rename from dev-lang/haxe/haxe-4.2.4-r1.ebuild
19 rename to dev-lang/haxe/haxe-4.2.4-r2.ebuild
20 index b391ef467182..6a8441c77ab2 100644
21 --- a/dev-lang/haxe/haxe-4.2.4-r1.ebuild
22 +++ b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
23 @@ -48,7 +48,11 @@ QA_FLAGS_IGNORED="usr/bin/haxelib"
24 QA_PRESTRIPPED="usr/bin/haxelib"
25
26 src_configure() {
27 - use ocamlopt && export OCAMLOPT=ocamlopt.opt
28 + if use ocamlopt ; then
29 + export OCAMLOPT=ocamlopt.opt
30 + else
31 + export OCAMLOPT=ocamlopt
32 + fi
33 }
34
35 src_compile() {
36 @@ -56,6 +60,7 @@ src_compile() {
37 BRANCH=""
38 COMMIT_DATE=""
39 COMMIT_SHA=""
40 + OCAMLOPT=${OCAMLOPT}
41 INSTALL_DIR=/usr
42 )
43 emake -j1