[gentoo-commits] repo/gentoo:master commit in: dev-lang/haxe/

[Maciej Barć]

commit:     229147d070a9c5d32533e577029dfe661edaaef1
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 20:40:06 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 20:41:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229147d0

dev-lang/haxe: make - ensure correct ocamlopt(.opt)

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/haxe/{haxe-4.2.4-r1.ebuild => haxe-4.2.4-r2.ebuild} | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-lang/haxe/haxe-4.2.4-r1.ebuild 
b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
similarity index 91%
rename from dev-lang/haxe/haxe-4.2.4-r1.ebuild
rename to dev-lang/haxe/haxe-4.2.4-r2.ebuild
index b391ef467182..6a8441c77ab2 100644
--- a/dev-lang/haxe/haxe-4.2.4-r1.ebuild
+++ b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
@@ -48,7 +48,11 @@ QA_FLAGS_IGNORED="usr/bin/haxelib"
 QA_PRESTRIPPED="usr/bin/haxelib"
 
 src_configure() {
-       use ocamlopt && export OCAMLOPT=ocamlopt.opt
+       if use ocamlopt ; then
+               export OCAMLOPT=ocamlopt.opt
+       else
+               export OCAMLOPT=ocamlopt
+       fi
 }
 
 src_compile() {
@@ -56,6 +60,7 @@ src_compile() {
                BRANCH=""
                COMMIT_DATE=""
                COMMIT_SHA=""
+               OCAMLOPT=${OCAMLOPT}
                INSTALL_DIR=/usr
        )
        emake -j1