From 298d08fab47a13b4a5f810d2d4efa126deba0a79 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 22 Feb 2020 14:00:29 +0100
Subject: [PATCH] ocaml: update to 4.10.0.

We use --disable-force-safe-string else just too much stuff breaks.
---
 .../patches/ocaml-4.08.0-elfv2-ppc64.patch    | 40 +++++++++----------
 srcpkgs/ocaml/template                        |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
index 144a555322a..65a6cea92ad 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
@@ -9,8 +9,8 @@
    | "ppc64le" -> ELF64v2
    | _ -> assert false
  
---- ocaml-4.08.0/runtime/power.S
-+++ ocaml-4.08.0/runtime/power.S
+--- ocaml-4.10.0/runtime/power.S
++++ ocaml-4.10.0/runtime/power.S
 @@ -13,7 +13,7 @@
  /*                                                                        */
  /**************************************************************************/
@@ -20,7 +20,7 @@
          .abiversion 2
  #endif
  
-@@ -41,8 +41,7 @@
+@@ -52,8 +52,7 @@
  #define TRAP_PREVIOUS_OFFSET 4
  #define CALLBACK_LINK_SIZE 16
  #define CALLBACK_LINK_OFFSET 0
@@ -30,7 +30,7 @@
  #define RESERVED_STACK 48
  #define PARAM_SAVE_AREA (8*8)
  #define LR_SAVE 16
-@@ -53,8 +52,7 @@
+@@ -64,8 +63,7 @@
  #define TRAP_PREVIOUS_OFFSET 64
  #define CALLBACK_LINK_SIZE 32
  #define CALLBACK_LINK_OFFSET 48
@@ -40,7 +40,7 @@
  #define RESERVED_STACK 32
  #define PARAM_SAVE_AREA 0
  #define LR_SAVE 16
-@@ -80,9 +78,8 @@
+@@ -91,9 +89,8 @@
  #define ENDFUNCTION(name) \
    .size name, . - name
  
@@ -51,7 +51,7 @@
  #define FUNCTION(name) \
    .section ".opd","aw"; \
    .align 3; \
-@@ -96,9 +93,8 @@
+@@ -107,9 +104,8 @@
  #define ENDFUNCTION(name) \
    .size name, . - .L.name
  
@@ -62,33 +62,33 @@
  #define FUNCTION(name) \
    .section ".text"; \
    .globl name; \
-@@ -157,7 +153,7 @@
+@@ -151,7 +147,7 @@
  
- #endif
+ #define Caml_state(var) 8*domain_field_caml_##var(28)
  
 -#if defined(MODEL_ppc64)
 +#if _CALL_ELF == 1
          .section ".opd","aw"
  #else
          .section ".text"
-@@ -338,14 +334,14 @@ FUNCTION(caml_c_call)
+@@ -332,14 +328,14 @@
  #if defined(MODEL_ppc)
-         mtctr   28
+         mtctr   C_CALL_FUN
          bctrl
 -#elif defined(MODEL_ppc64)
 +#elif _CALL_ELF == 1
-         ld      0, 0(28)
-         mr      26, 2   /* save current TOC in a callee-save register */
+         ld      0, 0(C_CALL_FUN)
+         mr      C_CALL_TOC, 2   /* save current TOC in a callee-save register */
          mtctr   0
-         ld      2, 8(28)
+         ld      2, 8(C_CALL_FUN)
          bctrl
-         mr      2, 26   /* restore current TOC */
+         mr      2, C_CALL_TOC   /* restore current TOC */
 -#elif defined(MODEL_ppc64le)
 +#elif _CALL_ELF == 2
-         mtctr   28
-         mr      12, 28
-         mr      26, 2   /* save current TOC in a callee-save register */
-@@ -514,14 +510,14 @@ FUNCTION(caml_start_program)
+         mtctr   C_CALL_FUN
+         mr      12, C_CALL_FUN
+         mr      C_CALL_TOC, 2   /* save current TOC in a callee-save register */
+@@ -515,14 +511,14 @@
  #if defined(MODEL_ppc)
          mtctr   12
  .L105:  bctrl
@@ -105,9 +105,9 @@
          mtctr   12
          std     2, TOC_SAVE(1)
  .L105:  bctrl
-@@ -634,7 +630,7 @@ FUNCTION(caml_callback3_exn)
+@@ -641,7 +637,7 @@
          b       .L102
- ENDFUNCTION(caml_callback3_exn)
+ ENDFUNCTION(caml_callback3_asm)
  
 -#if defined(MODEL_ppc64)
 +#if _CALL_ELF == 1
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 04858c4dd45..613e47c9547 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,9 +1,9 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.09.0
+version=4.10.0
 revision=1
 build_style="gnu-configure"
-configure_args="--with-pic"
+configure_args="--with-pic --disable-force-safe-string"
 make_build_target="world.opt"
 makedepends="ncurses-devel libX11-devel"
 short_desc="Main implementation of the Caml language"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3
+checksum=58bae0f0a79daf86ec755a173e593fef4ef588f15c6185993af88ceb9722bc39
 nocross=yes
 patch_args="-Np1"