Date: Saturday, November 9, 2019 @ 19:23:41 Author: arodseth Revision: 524867
upgpkg: haxe 4.0.1-1 Modified: haxe/trunk/PKGBUILD ----------+ PKGBUILD | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-09 18:50:21 UTC (rev 524866) +++ PKGBUILD 2019-11-09 19:23:41 UTC (rev 524867) @@ -6,7 +6,7 @@ # Contributor: Michael Fellinger <[email protected]> pkgname=haxe -pkgver=4.0.0 +pkgver=4.0.1 pkgrel=1 pkgdesc='Cross-platform toolkit and programming language' arch=(x86_64) @@ -18,8 +18,8 @@ makedepends=(git ocaml camlp4 zlib neko opam) provides=(haxe haxelib) options=(!strip !makeflags) -# tag: 4.0.0 -source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#commit=ef18b62"; +# tag: 4.0.1 +source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#commit=fcb00541a644af872333970bb0b6355b4b8fa5bf"; haxe.sh) sha256sums=('SKIP' 'da08272cf61872f3401ad8b9f0bf94a4b2bfbaeb7b65644ee822f4ac8aaaed10') @@ -30,13 +30,7 @@ # Patch the OCaml source files to use "Stdlib." instead of "Pervasives." (deprecated) find . -name "*.ml" -type f -exec sed -i "s/Pervasives\./Stdlib./g" {} \; -} -build() { - # Needed to make Haxe build with OCaml 4.06 and 4.07 - # For more info, see: https://github.com/HaxeFoundation/haxe/issues/6883#issuecomment-370142073 - export OCAMLPARAM="safe-string=0,_" - # Prepare opam and ocamlfind before building export HOME="$srcdir" opam init -a @@ -51,18 +45,23 @@ -exec sed -i "s/Pervasives\./Stdlib./g" {} \; # Build and install the modified sha package - export CCACHE_DISABLE=1 - opam install -b --inplace-build --reuse-build-dir -y sha + CCACHE_DISABLE=1 opam install -b --inplace-build --reuse-build-dir -y sha # Install the other dependencies - opam install -y ocamlfind camlp5 sedlex ppx_tools_versioned xml-light extlib ptmap || exit 1 + opam install -y ocamlfind camlp5 sedlex ppx_tools_versioned xml-light extlib ptmap +} - cd "$srcdir/$pkgname-$pkgver" +build() { + # Needed to make Haxe build with OCaml 4.06 and 4.07 + # For more info, see: https://github.com/HaxeFoundation/haxe/issues/6883#issuecomment-370142073 + export OCAMLPARAM="safe-string=0,_" - # Build two make targets - make libs - make haxe + # Prepare opam and ocamlfind before building + eval $(opam env) + cd "$pkgname-$pkgver" + make libs haxe + # "make tools" did not work. These are the replacement commands: cd "$srcdir/$pkgname-$pkgver/extra/haxelib_src" ../../haxe client.hxml || true @@ -71,8 +70,8 @@ } check() { - "$srcdir/$pkgname-$pkgver/haxe" -version - "$srcdir/$pkgname-$pkgver/haxelib" version + "$pkgname-$pkgver/haxe" -version + "$pkgname-$pkgver/haxelib" version } package() {
