[arch-commits] Commit in haxe/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, March 14, 2018 @ 11:15:33
  Author: arodseth
Revision: 307684

upgpkg: haxe 3.4.7-1

Modified:
  haxe/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-14 10:06:19 UTC (rev 307683)
+++ PKGBUILD	2018-03-14 11:15:33 UTC (rev 307684)
@@ -7,7 +7,7 @@
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=3.4.4
+pkgver=3.4.7
 pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=('x86_64')
@@ -19,26 +19,22 @@
 makedepends=('git' 'ocaml' 'camlp4' 'zlib' 'neko')
 provides=('haxe' 'haxelib')
 options=('!strip' '!makeflags')
-source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#tag=3.4.4"
-  'git+https://github.com/HaxeFoundation/haxelib.git#commit=9056886d636e9d7d0e1759195c60b0260b8c67c0'
-  'git+https://github.com/HaxeFoundation/ocamllibs.git#commit=21d6a6673a49f024ccb8306d08927fc3fabe81af'
-  'haxe.sh'
-)
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#tag=$pkgver"
+        'haxe.sh')
 md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
          '977476c8fc1dfc0acbb05bd22f9136b0')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  git submodule init
-  git config submodule.extra/haxelib_src.url "$srcdir/haxelib"
-  git config submodule.libs.url "$srcdir/ocamllibs"
-  git submodule update
+  git submodule update --init --recursive
 }
 
 build() {
+  # Needed to make Haxe build with OCaml 4.06
+  # For more info, see: https://github.com/HaxeFoundation/haxe/issues/6883#issuecomment-370142073
+  export OCAMLPARAM="safe-string=0,_"
+
   make -C "$pkgname-$pkgver" all tools
 }