CVS commit: pkgsrc/lang/ocaml

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul 15 12:44:21 UTC 2016

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

Log Message:
Fix build on 32-bit SunOS with 64-bit native assembler.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ocaml/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.98 pkgsrc/lang/ocaml/distinfo:1.99
--- pkgsrc/lang/ocaml/distinfo:1.98     Wed Jul 13 15:01:42 2016
+++ pkgsrc/lang/ocaml/distinfo  Fri Jul 15 12:44:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2016/07/13 15:01:42 jperkin Exp $
+$NetBSD: distinfo,v 1.99 2016/07/15 12:44:21 jperkin Exp $
 
 SHA1 (ocaml-4.03.0.tar.gz) = 28773fd89507dbc400a366b886425436569e70d8
 RMD160 (ocaml-4.03.0.tar.gz) = 774934e72746cd8b94ac732abdd47d7f06344fda
@@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_asmlink.ml) = db2b38
 SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
 SHA1 (patch-asmrun_signals_osdep.h) = 0e72ee5595b937384284c884c2dd2a8be32e824c
 SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
-SHA1 (patch-configure) = cb7eee978dcf26d003cb041e7c2694f89065d7fd
+SHA1 (patch-configure) = f4a9f3e90be741ead35459a5a4a5b021558b84e7
 SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.17 pkgsrc/lang/ocaml/patches/patch-configure:1.18
--- pkgsrc/lang/ocaml/patches/patch-configure:1.17      Wed Jul 13 15:01:42 2016
+++ pkgsrc/lang/ocaml/patches/patch-configure   Fri Jul 15 12:44:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.17 2016/07/13 15:01:42 jperkin Exp $
+$NetBSD: patch-configure,v 1.18 2016/07/15 12:44:21 jperkin Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
 See also: <http://caml.inria.fr/mantis/view.php?id=6900>
@@ -98,11 +98,13 @@ See also: <http://caml.inria.fr/mantis/v
    power,gcc*,elf,ppc)   partialld="ld -r -m elf32ppclinux";;
    power,gcc*,elf,ppc64)   partialld="ld -r -m elf64ppc";;
    power,gcc*,elf,ppc64le)   partialld="ld -r -m elf64lppc";;
-@@ -913,7 +919,7 @@ case "$arch,$system" in
+@@ -912,8 +918,8 @@ case "$arch,$system" in
+                     fi;;
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
-   i386,solaris)   as="${TOOLPREF}as"
+-  i386,solaris)   as="${TOOLPREF}as"
 -                  aspp="/usr/ccs/bin/${TOOLPREF}as -P";;
++  i386,solaris)   as="${TOOLPREF}as --32"
 +                  aspp="gcc -m32 -c";;
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"