diff --git a/haxe.spec b/haxe.spec index 8a8bfdd..53f8a18 100644 --- a/haxe.spec +++ b/haxe.spec @@ -3,7 +3,7 @@ Name: haxe Version: 4.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multi-target universal programming language # As described in https://haxe.org/foundation/open-source.html: @@ -33,6 +33,7 @@ BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-ptmap-devel BuildRequires: ocaml-sha-devel +BuildRequires: ocaml-gen-devel BuildRequires: zlib-devel BuildRequires: pcre-devel BuildRequires: cmake @@ -64,7 +65,11 @@ pushd extra/haxelib_src/hx3compat && tar -xf %{SOURCE2} --strip-components=1 && # Check to see if ocamlopt exists. If not, bytecompile everything. # It is because ocamlopt may be missing in some architectures. -command -v ocamlopt && make libs haxe || make libs haxe BYTECODE=1 +if [ -x "$(command -v ocamlopt)" ]; then + make libs haxe +else + make libs haxe BYTECODE=1 +fi # Compile haxelib pushd extra/haxelib_src && %cmake . && %make_build && popd @@ -89,6 +94,8 @@ help2man ./haxelib --help-option=help --version-option=version --no-info --outpu %{buildroot}%{_bindir}/haxe -version %{buildroot}%{_bindir}/haxelib version +%{buildroot}%{_bindir}/haxe -v Std + %files %doc README.md %license extra/LICENSE.txt @@ -103,6 +110,11 @@ help2man ./haxelib --help-option=help --version-option=version --no-info --outpu %{_datadir}/%{name}/ %changelog +* Tue Mar 31 2020 Andy Li - 4.0.5-5 +- Fix build command to avoid accidentially building to OCaml bytecode. +- Add test that runs the Haxe compiler. +- Add missing BuildRequires: ocaml-gen-devel. + * Sun Mar 08 2020 Richard W.M. Jones - 4.0.5-4 - Bump and rebuild for camlp5 7.11.