Synchronised ARM changes with ocaml

[Jaap Boender <jaapb%kerguelen.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%kerguelen.org@localhost>
Pushed By:	jaapb
Date:		Wed Apr 1 08:00:37 2020 +0000
Changeset:	46dc2bde722de14de63c12058789cb2a439ff239

Modified Files:
	ocaml/distinfo
	ocaml/patches/patch-configure

Log Message:
Synchronised ARM changes with ocaml

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=46dc2bde722de14de63c12058789cb2a439ff239

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ocaml/distinfo                |  2 +-
 ocaml/patches/patch-configure | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs:
diff --git a/ocaml/distinfo b/ocaml/distinfo
index d3d514eedc..c07d64ddb9 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 50103df7b34f110a1d7f2b9c2d7f47c9885e8b52
 SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
 SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
 SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
-SHA1 (patch-configure) = 311b18383bcc88f2a67d83d4b0c6e35344bd2d0d
+SHA1 (patch-configure) = 9cfa2a48d716f83429a24faf3d34273517ed88db
 SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index a84e6b250f..70049a8238 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -7,9 +7,9 @@ Add SunOS -lnsl -lsocket
 Recognise SunOS/amd64 as amd64
 Recognise SunOS as having shared libraries
 
---- configure.orig	2019-09-11 14:40:30.000000000 +0000
+--- configure.orig	2020-02-21 14:22:37.000000000 +0000
 +++ configure
-@@ -13281,7 +13281,7 @@ sharedlib_cflags=''
+@@ -13407,7 +13407,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
@@ -18,7 +18,7 @@ Recognise SunOS as having shared libraries
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13471,10 +13471,14 @@ fi ;; #(
+@@ -13503,12 +13503,16 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    arm*-*-freebsd*) :
      natdynlink=true ;; #(
@@ -26,6 +26,8 @@ Recognise SunOS as having shared libraries
 +    natdynlink=true ;; #(
    earm*-*-netbsd*) :
      natdynlink=true ;; #(
+   aarch64-*-linux*) :
+     natdynlink=true ;; #(
    aarch64-*-freebsd*) :
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
@@ -33,7 +35,7 @@ Recognise SunOS as having shared libraries
    *) :
       ;;
  esac
-@@ -13434,6 +13436,8 @@ case $host in #(
+@@ -13578,6 +13582,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -42,7 +44,7 @@ Recognise SunOS as having shared libraries
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -13468,6 +13472,10 @@ fi; system=elf ;; #(
+@@ -13612,6 +13618,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -53,7 +55,7 @@ Recognise SunOS as having shared libraries
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13504,6 +13512,8 @@ fi; system=elf ;; #(
+@@ -13648,6 +13658,8 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
    aarch64-*-freebsd*) :
      arch=arm64; system=freebsd ;; #(
@@ -62,7 +64,7 @@ Recognise SunOS as having shared libraries
    x86_64-*-cygwin*) :
      arch=amd64; system=cygwin
   ;; #(
-@@ -13788,7 +13798,7 @@ fi
+@@ -13932,7 +13944,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(