community/ocaml: update to 4.08.0

Fixes https://gitlab.alpinelinux.org/alpine/aports/issues/10583

5 files changed, 58 insertions, 47 deletions

diff --git a/community/ocaml/APKBUILD b/community/ocaml/APKBUILD
index 12b997b34a..b8be0a1e06 100644
--- a/community/ocaml/APKBUILD
+++ b/community/ocaml/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ocaml
-pkgver=4.07.1
-pkgrel=1
+pkgver=4.08.0
+pkgrel=0
 pkgdesc="Main implementation of the Caml programming language"
 url="http://ocaml.org/"
 arch="aarch64 ppc64le x86_64"
@@ -20,23 +20,22 @@ subpackages="
 	"
 source="http://caml.inria.fr/pub/distrib/ocaml-${pkgver%.*}/$pkgname-$pkgver.tar.gz
 	compile-without-debug-info.patch
-	fix-mcontext-fields.patch
+        fix-mcontext-fields.patch
 	fix-segfault-in-ppc64le.patch
+	fix-check-parser-uptodate-or-warn.sh.patch
 	"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
-
 	./configure \
 		--prefix /usr \
 		--bindir /usr/bin \
 		--libdir /usr/lib/ocaml \
 		--mandir /usr/share/man \
-		-cc "${CC:-gcc}" \
-		-as "${CC:-gcc} -c" \
-		-aspp "${CC:-gcc} -c" \
-		-fPIC
+		CC="${CC:-gcc}" \
+		AS="${CC:-gcc} -c" \
+		ASPP="${CC:-gcc} -c" 
 	make world.opt
 }
 
@@ -119,7 +118,8 @@ _submv() {
 	rmdir -p "$pkgdir"/${path%/*} 2>/dev/null || true
 }
 
-sha512sums="a7faed1759f76b91afb0922de159240cc11d68f89e2136d2f3add4d3e66fe923f27a094a937a7d7e73727a1675864e8ff41882eeaa4212d8c4dfeb2811e1707a  ocaml-4.07.1.tar.gz
-b42af74ae80428a0488bbb182ca5f48d35ce34d6ba336aa10904a78863e7e1e6b61303d5cd3ad89cba5329cb0983692ba92341e2058ea3e31bb22aa4f7b46dd8  compile-without-debug-info.patch
-75c67e143a4a05b334bdebbad48ded1e04d383d8ea9b747df2633a5af96b1115b502510faf57753c71bbac38fbc9d9746b167861a63b2fd295901db0d22ea317  fix-mcontext-fields.patch
-b2cef41400b31c1dcfd206c1534827f7b33b0afd6234b26fb95cf15c092affa85c27a615c14ece254ec326430f31b58ca70b9cc23a84ebf8baac2624bd5b0a71  fix-segfault-in-ppc64le.patch"
+sha512sums="7d2f02e7eda7a1ce619876afbc484c83b22ed23ab06309a6a04cc99fd552e9358450261a9dee96e4d29d23fa900d5948e62f15b11ce00e23fea6a2bf6d3babab  ocaml-4.08.0.tar.gz
+49cbd6df3a70d00df33d34ab4508dd04d52cbc94efc6c8cac8668758e7346be3c7acedf5b8af38a0adb18c69b8d0859667b12cc11699002c048af962cf283ad2  compile-without-debug-info.patch
+cd0b9a8c3dc8d952a40eb1758cc74dc388ec4bcc5fe5a25c3f073f0088bf51027b53ea1b9f6d02a84b11bd3964bec1c50b5da28caa7c1e31ec76f9930ea7d527  fix-mcontext-fields.patch
+e65b647427d9c94933d5be97857daf8cdc65e25c10066740dbcbab7a4e6f8ddb2277ee7d5796abf5916e5bdd59b057de736190432c480fc8ff2a4b2a94d46eca  fix-segfault-in-ppc64le.patch
+b3362906c23ecdb084db7dbf18cae22f0a54ba968f1ecf9c8d13c230ca221b3f77fa820a52e091ce7b71b1cb4a91faf1346692aa6fa411bb46fca784500def25  fix-check-parser-uptodate-or-warn.sh.patch"
diff --git a/community/ocaml/compile-without-debug-info.patch b/community/ocaml/compile-without-debug-info.patch
index 06b0eda820..f2b63e4b60 100644
--- a/community/ocaml/compile-without-debug-info.patch
+++ b/community/ocaml/compile-without-debug-info.patch
@@ -2,14 +2,15 @@ Significantly decrease size of bytecode-compiled binaries (and slightly
 even natives).
 --- a/Makefile
 +++ b/Makefile
-@@ -52,8 +52,8 @@
- CAMLYACC ?= boot/ocamlyacc
+@@ -44,8 +44,8 @@
+ CAMLRUN ?= boot/ocamlrun
  include stdlib/StdlibModules
  
--CAMLC=$(CAMLRUN) boot/ocamlc -g -nostdlib -I boot -use-prims byterun/primitives
+-CAMLC=$(CAMLRUN) boot/ocamlc -g -nostdlib -I boot -use-prims runtime/primitives
 -CAMLOPT=$(CAMLRUN) ./ocamlopt -g -nostdlib -I stdlib -I otherlibs/dynlink
-+CAMLC=$(CAMLRUN) boot/ocamlc -nostdlib -I boot -use-prims byterun/primitives
++CAMLC=$(CAMLRUN) boot/ocamlc -nostdlib -I boot -use-prims runtime/primitives
 +CAMLOPT=$(CAMLRUN) ./ocamlopt -nostdlib -I stdlib -I otherlibs/dynlink
  ARCHES=amd64 i386 arm arm64 power s390x
  INCLUDES=-I utils -I parsing -I typing -I bytecomp -I middle_end \
          -I middle_end/base_types -I asmcomp -I asmcomp/debug \
+
diff --git a/community/ocaml/fix-check-parser-uptodate-or-warn.sh.patch b/community/ocaml/fix-check-parser-uptodate-or-warn.sh.patch
new file mode 100644
index 0000000000..f78aaf0c23
--- /dev/null
+++ b/community/ocaml/fix-check-parser-uptodate-or-warn.sh.patch
@@ -0,0 +1,14 @@
+--- a/tools/check-parser-uptodate-or-warn.sh	2019-06-14 08:21:51.000000000 -0300
++++ b/tools/check-parser-uptodate-or-warn.sh	2019-07-16 14:56:27.352376332 -0300
+@@ -43,8 +43,8 @@
+ }
+ 
+ # The check itself
+-SOURCE_MTIME=$(mtime parsing/parser.mly)
+-GENERATED_MTIME=$(mtime boot/menhir/parser.ml)
++SOURCE_MTIME=$(mtime "$builddir"/parsing/parser.mly)
++GENERATED_MTIME=$(mtime "$builddir"/boot/menhir/parser.ml)
+ if test $SOURCE_MTIME -gt $(( $GENERATED_MTIME + 10 ))
+ then
+   echo
+
diff --git a/community/ocaml/fix-mcontext-fields.patch b/community/ocaml/fix-mcontext-fields.patch
index e47f348b23..436057df76 100644
--- a/community/ocaml/fix-mcontext-fields.patch
+++ b/community/ocaml/fix-mcontext-fields.patch
@@ -1,27 +1,7 @@
-diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
---- a/asmrun/signals_osdep.h   2016-11-04 16:08:24.000000000 +0000
-+++ b/asmrun/signals_osdep.h   2017-05-13 03:16:28.749615533 +0000
-@@ -314,11 +314,11 @@
-      sigact.sa_flags = 0
- 
-   typedef unsigned long context_reg;
--  #define CONTEXT_PC (context->sregs->regs.psw.addr)
--  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
--  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
--  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
--  #define CONTEXT_SP (context->sregs->regs.gprs[15])
-+  #define CONTEXT_PC (context->sregs->psw.addr)
-+  #define CONTEXT_EXCEPTION_POINTER (context->sregs->gregs[13])
-+  #define CONTEXT_YOUNG_LIMIT (context->sregs->gregs[10])
-+  #define CONTEXT_YOUNG_PTR (context->sregs->gregs[11])
-+  #define CONTEXT_SP (context->sregs->gregs[15])
- 
- /****************** PowerPC, BSD */
- 
-diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
---- a/asmrun/signals_osdep.h    2017-05-13 03:19:52.863954544 +0000
-+++ b/asmrun/signals_osdep.h    2017-05-13 04:10:48.417194351 +0000
-@@ -297,11 +297,20 @@
+diff -Nru a/runtime/signals_osdep.h b/runtime/signals_osdep.h
+--- a/runtime/signals_osdep.h   2019-06-14 08:21:51.000000000 -0300
++++ b/runtime/signals_osdep.h   2019-07-16 14:21:56.751434439 -0300
+@@ -297,11 +297,19 @@
       sigact.sa_flags = 0
  
    typedef unsigned long context_reg;
@@ -30,7 +10,6 @@ diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
 -  #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30])
 -  #define CONTEXT_YOUNG_PTR (context->regs->gpr[31])
 -  #define CONTEXT_SP (context->regs->gpr[1])
-+
 +  #ifdef __powerpc64__
 +    #define CONTEXT_PC (context->gp_regs[32])
 +    #define CONTEXT_EXCEPTION_POINTER (context->gp_regs[29])
@@ -45,5 +24,21 @@ diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
 +    #define CONTEXT_SP (context->regs->gpr[1])
 +  #endif
  
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+ 
+@@ -354,11 +362,11 @@
+      sigact.sa_flags = 0
+ 
+   typedef unsigned long context_reg;
+-  #define CONTEXT_PC (context->sregs->regs.psw.addr)
+-  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
+-  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
+-  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
+-  #define CONTEXT_SP (context->sregs->regs.gprs[15])
++  #define CONTEXT_PC (context->sregs->psw.addr)
++  #define CONTEXT_EXCEPTION_POINTER (context->sregs->gregs[13])
++  #define CONTEXT_YOUNG_LIMIT (context->sregs->gregs[10])
++  #define CONTEXT_YOUNG_PTR (context->sregs->gregs[11])
++  #define CONTEXT_SP (context->sregs->gregs[15])
+ 
+ /******************** Default */
diff --git a/community/ocaml/fix-segfault-in-ppc64le.patch b/community/ocaml/fix-segfault-in-ppc64le.patch
index 81c837079c..85587e74c2 100644
--- a/community/ocaml/fix-segfault-in-ppc64le.patch
+++ b/community/ocaml/fix-segfault-in-ppc64le.patch
@@ -19,13 +19,14 @@ Upstream-Issue: https://caml.inria.fr/mantis/view.php?id=7562.
 
 --- a/configure
 +++ b/configure
-@@ -867,6 +867,9 @@
-       sharedcccompopts="-fPIC"
-       mksharedlib="$cc -shared"
-       ldflags="$ldflags -Wl,-E"
+@@ -13334,6 +13334,9 @@
+     sharedlib_cflags="-fPIC"
+       mksharedlib="$CC -shared"
+       oc_ldflags="$oc_ldflags -Wl,-E"
 +      case "$target" in
 +        powerpc64le*) ldflags="$ldflags -no-pie"
 +      esac
        rpath="-Wl,-rpath,"
        mksharedlibrpath="-Wl,-rpath,"
        natdynlinkopts="-Wl,-E"
+