summaryrefslogtreecommitdiff
path: root/lang/ocaml/patches/patch-ai
diff options
context:
space:
mode:
authortron <tron>2004-04-22 09:18:34 +0000
committertron <tron>2004-04-22 09:18:34 +0000
commitd730e797ceb41d3c65f5f93175e749aab7304d0d (patch)
tree59672b97d93cb0901c01e1fad17ba3b32b924095 /lang/ocaml/patches/patch-ai
parentdb00d969c5c33ff82e28c6ea5d129a47e9b364fa (diff)
downloadpkgsrc-d730e797ceb41d3c65f5f93175e749aab7304d0d.tar.gz
Fix various issues with this package:
- split patches files - always enable threading which has various advantages - it fixes the build of the Tk library - it greatly simplifies the package list handling - it provides threading support under NetBSD 1.6/1.6.x - correct default dependence in "buildlink2.mk" to "build" Bump package revision because of all these changes.
Diffstat (limited to 'lang/ocaml/patches/patch-ai')
-rw-r--r--lang/ocaml/patches/patch-ai37
1 files changed, 16 insertions, 21 deletions
diff --git a/lang/ocaml/patches/patch-ai b/lang/ocaml/patches/patch-ai
index bfc6c21d185..55de5f28fd7 100644
--- a/lang/ocaml/patches/patch-ai
+++ b/lang/ocaml/patches/patch-ai
@@ -1,22 +1,17 @@
-$NetBSD: patch-ai,v 1.1 2003/06/29 23:04:19 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2004/04/22 09:18:36 tron Exp $
---- asmcomp/power/proc.ml.orig
-+++ asmcomp/power/proc.ml
-@@ -190,7 +190,7 @@
- let loc_external_arguments =
- match Config.system with
- "aix" | "rhapsody" -> poweropen_external_conventions 0 7 100 112
-- | "elf" -> calling_conventions 0 7 100 107 outgoing 8
-+ | "elf" | "bsd" -> calling_conventions 0 7 100 107 outgoing 8
- | _ -> assert false
-
- let extcall_use_push = false
-@@ -244,7 +244,7 @@
- Ccomp.command ("as -u -m " ^ proc ^ " -o " ^ outfile ^ " " ^ infile)
- | "elf" ->
- Ccomp.command ("as -u -m ppc -o " ^ outfile ^ " " ^ infile)
-- | "rhapsody" ->
-+ | "rhapsody" | "bsd" ->
- Ccomp.command ("as -o " ^ outfile ^ " " ^ infile)
- | _ -> assert false
-
+--- asmrun/i386.S.orig Fri Jun 7 11:49:36 2002
++++ asmrun/i386.S Thu Apr 22 10:34:38 2004
+@@ -53,10 +53,10 @@
+ #elif defined(SYS_bsd_elf)
+ #define PROFILE_CAML \
+ pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \
+- call .mcount; \
++ call __mcount; \
+ popl %edx; popl %ecx; popl %eax; popl %ebp
+ #define PROFILE_C \
+- pushl %ebp; movl %esp, %ebp; call .mcount; popl %ebp
++ pushl %ebp; movl %esp, %ebp; call __mcount; popl %ebp
+ #endif
+ #else
+ #define PROFILE_CAML