ocaml: Fix Solaris builds.

[Jonathan Perkin <jperkin%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Tue Dec 8 14:28:20 2020 +0000
Changeset:	f806a8f1d7eea3a7dd9c57b508c14db17c438ef2

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

Log Message:
ocaml: Fix Solaris builds.

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

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 | 50 +++++++++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 19 deletions(-)

diffs:
diff --git a/ocaml/distinfo b/ocaml/distinfo
index db1d572937..c1d71c5fef 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
 SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
 SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 833ce290f4670a015deba680cb105214f074128a
+SHA1 (patch-configure) = 5791eba70a6d06fe79f6268a3d4e40a1dc636fd1
 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 ddecc9815a..6efe9de8ed 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -18,24 +18,29 @@ Recognise SunOS as having shared libraries
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13512,9 +13512,14 @@ esac ;; #(
-       rpath="-Wl,-rpath,"
+@@ -13513,6 +13513,12 @@ esac ;; #(
        mksharedlibrpath="-Wl,-rpath,"
        natdynlinkopts="-Wl,-E"
--      shared_libraries_supported=true ;; #(
-+      shared_libraries_supported=true
-+  *-*-solaris* ;; #( 
-   *) :
--     ;;
+       shared_libraries_supported=true ;; #(
++  *-*-solaris*)
 +    sharedlib_cflags="-fPIC"
 +    mksharedlib="$CC -shared"
 +    rpath="-Wl,-rpath,"
 +    mksharedlibrpath="-Wl,rpath,"
 +    shared_libraries_supported=true ;;
+   *) :
+      ;;
  esac
- fi
- 
-@@ -13562,6 +13567,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -13534,6 +13540,8 @@ if test x"$enable_shared" != "xno"; then
+     natdynlink=true ;; #(
+   *-pc-windows) :
+     natdynlink=true ;; #(
++  *-*-solaris*) :
++    natdynlink=true ;; #(
+   i[3456]86-*-linux*) :
+     natdynlink=true ;; #(
+   i[3456]86-*-gnu*) :
+@@ -13562,6 +13570,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    i[3456]86-*-netbsd*) :
      natdynlink=true ;; #(
@@ -44,7 +49,7 @@ Recognise SunOS as having shared libraries
    x86_64-*-netbsd*) :
      natdynlink=true ;; #(
    i386-*-gnu0.3) :
-@@ -13572,12 +13579,16 @@ if test x"$enable_shared" != "xno"; then
+@@ -13572,12 +13582,16 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    arm*-*-freebsd*) :
      natdynlink=true ;; #(
@@ -61,7 +66,7 @@ Recognise SunOS as having shared libraries
    riscv*-*-linux*) :
      natdynlink=true ;; #(
    *) :
-@@ -13649,6 +13660,8 @@ case $host in #(
+@@ -13649,6 +13663,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -70,7 +75,7 @@ Recognise SunOS as having shared libraries
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -13665,6 +13678,8 @@ case $host in #(
+@@ -13665,6 +13681,8 @@ case $host in #(
  else
    model=ppc
  fi; system=elf ;; #(
@@ -79,7 +84,7 @@ Recognise SunOS as having shared libraries
    s390x*-*-linux*) :
      arch=s390x; model=z10; system=elf ;; #(
    armv6*-*-linux-gnueabihf) :
-@@ -13683,6 +13698,10 @@ fi; system=elf ;; #(
+@@ -13683,6 +13701,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -90,7 +95,7 @@ Recognise SunOS as having shared libraries
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13719,8 +13738,12 @@ fi; system=elf ;; #(
+@@ -13719,8 +13741,12 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
    aarch64-*-freebsd*) :
      arch=arm64; system=freebsd ;; #(
@@ -103,7 +108,16 @@ Recognise SunOS as having shared libraries
    riscv64-*-linux*) :
      arch=riscv; model=riscv64; system=linux
   ;; #(
-@@ -13947,6 +13970,9 @@ esac ;; #(
+@@ -13851,8 +13877,6 @@ if test -z "$PARTIALLD"; then :
+   case "$arch,$CC,$system,$model" in #(
+   amd64,gcc*,macosx,*) :
+     PACKLD='ld -r -arch x86_64 -o $(EMPTY)' ;; #(
+-  amd64,gcc*,solaris,*) :
+-    PACKLD='ld -r -m elf_x86_64 -o $(EMPTY)' ;; #(
+   power,gcc*,elf,ppc) :
+     PACKLD='ld -r -m elf32ppclinux -o $(EMPTY)' ;; #(
+   power,gcc*,elf,ppc64) :
+@@ -13947,6 +13971,9 @@ esac ;; #(
    *) :
       ;;
  esac ;; #(
@@ -113,7 +127,7 @@ Recognise SunOS as having shared libraries
    s390x,elf) :
      default_as="${toolpref}as -m 64 -march=$model"
      default_aspp="${toolpref}gcc -c -Wa,-march=$model" ;; #(
-@@ -14028,7 +14054,7 @@ fi
+@@ -14028,7 +14055,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
@@ -122,7 +136,7 @@ Recognise SunOS as having shared libraries
       ;; #(
    *) :
      has_c99_float_ops=true
-@@ -14317,6 +14343,9 @@ case $host in #(
+@@ -14317,6 +14344,9 @@ case $host in #(
    *-*-mingw32|*-pc-windows) :
      cclibs="$cclibs -lws2_32"
      sockets=true ;; #(