diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-07-15 12:44:21 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-07-15 12:44:21 +0000 |
| commit | 00827e5c6d49b039fbfb70dbaf2323ded907d043 (patch) | |
| tree | 5bda53f947895f8cd1aeb3d0bd13845f34ec7daf /lang/ocaml | |
| parent | 236354b86e502a75216ab5010c191252e8773286 (diff) | |
| download | pkgsrc-00827e5c6d49b039fbfb70dbaf2323ded907d043.tar.gz | |
Fix build on 32-bit SunOS with 64-bit native assembler.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-configure | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index d547d62d9ed..00ab80df1e8 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -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) = db2b387ea17f41a62c2bce53b91f945d5e29a82f 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 diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 4c727286bf4..088f1b825c5 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -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/view.php?id=6900> 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" |