diff options
author | jmc <jmc@pkgsrc.org> | 2002-03-06 20:55:12 +0000 |
---|---|---|
committer | jmc <jmc@pkgsrc.org> | 2002-03-06 20:55:12 +0000 |
commit | adb3310fd97e7c76802ccbd1ed0adb81fd463635 (patch) | |
tree | 1eefe6b65af56b5e3a5f0b7f581df0f6e098736a /lang | |
parent | ea5c83babc0c38c13a802fd13321bcb7f9aad7e0 (diff) | |
download | pkgsrc-adb3310fd97e7c76802ccbd1ed0adb81fd463635.tar.gz |
Patch on powerpc and avoid using the r* definitions as they conflict with
frame.h
Diffstat (limited to 'lang')
-rw-r--r-- | lang/mercury/distinfo | 3 | ||||
-rw-r--r-- | lang/mercury/patches/patch-al | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo index 9c745361235..5f4f8057c20 100644 --- a/lang/mercury/distinfo +++ b/lang/mercury/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/15 21:09:44 jtb Exp $ +$NetBSD: distinfo,v 1.2 2002/03/06 20:55:12 jmc Exp $ SHA1 (mercury-compiler-0.10.1.tar.gz) = 5e4e660cca1e9e6e28026814fd2e6d014ab9d856 Size (mercury-compiler-0.10.1.tar.gz) = 10428428 bytes @@ -13,3 +13,4 @@ SHA1 (patch-ah) = 87b4976ca126f0b4e26636f770716cd34cebdf1d SHA1 (patch-ai) = 7ca545d17a3981f7d6e872c4b3cacaba3f782fd7 SHA1 (patch-aj) = 42ae96a2834b3a045b35506de988c48c5330e13d SHA1 (patch-ak) = cd2344776a799f0dd3bbaab4195cbf41c0cf894a +SHA1 (patch-al) = eebee2b980f989639e4f117d90e931e7f7cb128e diff --git a/lang/mercury/patches/patch-al b/lang/mercury/patches/patch-al new file mode 100644 index 00000000000..6ad911249d1 --- /dev/null +++ b/lang/mercury/patches/patch-al @@ -0,0 +1,21 @@ +$NetBSD: patch-al,v 1.1 2002/03/06 20:55:13 jmc Exp $ + +--- runtime/mercury_bootstrap.h.orig Mon Apr 2 15:52:15 2001 ++++ runtime/mercury_bootstrap.h Wed Mar 6 18:34:48 2002 +@@ -30,6 +30,7 @@ + + #ifndef MR_NO_BACKWARDS_COMPAT + ++#if !(defined(__NetBSD__) && defined(__powerpc__)) + #define r1 MR_r1 + #define r2 MR_r2 + #define r3 MR_r3 +@@ -66,6 +67,8 @@ + #define r(N) MR_r(N) + + #define NUM_REAL_REGS MR_NUM_REAL_REGS ++ ++#endif + + #define progname MR_progname + #define program_entry_point MR_program_entry_point |