summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorhe <he>2009-04-17 22:08:44 +0000
committerhe <he>2009-04-17 22:08:44 +0000
commit5e7dc467d26b35c58804b2ad07fe5f120002dbbb (patch)
tree72eb7da7880e71aa9ec008284f4cb53ec431d982 /lang
parent488fa8f5f7cf8fb44cec23367687f8ecd2ddbefe (diff)
downloadpkgsrc-5e7dc467d26b35c58804b2ad07fe5f120002dbbb.tar.gz
For the NetBSD/powerpc 3.x case, use the enums out of <powerpc/reloc.h>
instead of literal integers. Again, this should not result in different code, so no reason to bump revision.
Diffstat (limited to 'lang')
-rw-r--r--lang/parrot/distinfo4
-rw-r--r--lang/parrot/patches/patch-ab14
2 files changed, 9 insertions, 9 deletions
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index d9d3ab3b0b8..c2f41f334c7 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2009/04/17 19:54:39 he Exp $
+$NetBSD: distinfo,v 1.10 2009/04/17 22:08:44 he Exp $
SHA1 (parrot-1.0.0.tar.gz) = 9e028f5fff38a332c13ad4389652a016d7a824f7
RMD160 (parrot-1.0.0.tar.gz) = 46f60accd33f16cc910f4ea03840badc358d22c7
Size (parrot-1.0.0.tar.gz) = 3908888 bytes
SHA1 (patch-aa) = b3ad6ae9acbd8f25682395933fe48209b50a9752
-SHA1 (patch-ab) = d00168e31daff02ca0ccaec532f029ff7d0126e6
+SHA1 (patch-ab) = d58ab8a52dc844069e318f8442d5325a3afad876
SHA1 (patch-ac) = 5e2875b46aa390fc512bf22001146a4a470ae192
SHA1 (patch-ad) = 9002a7ca55f8f960bea669e383431b3eeb83a878
SHA1 (patch-ae) = 72e4752112dab2f0b72ede5c45b77fd5b5554606
diff --git a/lang/parrot/patches/patch-ab b/lang/parrot/patches/patch-ab
index 31f7532942a..794f21e9c9d 100644
--- a/lang/parrot/patches/patch-ab
+++ b/lang/parrot/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.5 2009/04/17 19:54:39 he Exp $
+$NetBSD: patch-ab,v 1.6 2009/04/17 22:08:44 he Exp $
The R_PPC_ADDR16{HI,LO} constants are named something else on
NetBSD, and might be elsewhere.
-Also add workarounds for NetBSD/powerpc 3.x, which has a minimal
-<powerpc/elf_machdep.h> file.
+Also add workarounds for NetBSD/powerpc 3.x, which has some
+constants defined as enums.
--- src/exec_save.c.orig 2009-03-08 20:32:43.000000000 +0000
+++ src/exec_save.c
@@ -19,15 +19,15 @@ Also add workarounds for NetBSD/powerpc 3.x, which has a minimal
+#endif
+/*
+ * NetBSD/powerpc 3.x doesn't define these constants,
-+ * so add some workarounds for it.
++ * but instead has them as enums, so add some workarounds for it.
+ */
+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
+ defined(__NetBSD__)
-+# define R_PPC_ADDR16_HI 5
-+# define R_PPC_ADDR16_LO 4
++# define R_PPC_ADDR16_HI RELOC_16_HI
++# define R_PPC_ADDR16_LO RELOC_16_LO
+#endif
+#if !defined(R_PPC_REL24) && defined(__NetBSD__)
-+# define R_PPC_REL24 10
++# define R_PPC_REL24 RELOC_REL24
+#endif
+#endif /* PARROT_PPC */
+