Fri Apr 17 22:08:44 2009 UTC ()
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.


(he)
diff -r1.9 -r1.10 pkgsrc/lang/parrot/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/parrot/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/lang/parrot/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/parrot/distinfo 2009/04/17 19:54:39 1.9
+++ pkgsrc/lang/parrot/distinfo 2009/04/17 22:08:44 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.9 2009/04/17 19:54:39 he Exp $ 1$NetBSD: distinfo,v 1.10 2009/04/17 22:08:44 he Exp $
2 2
3SHA1 (parrot-1.0.0.tar.gz) = 9e028f5fff38a332c13ad4389652a016d7a824f7 3SHA1 (parrot-1.0.0.tar.gz) = 9e028f5fff38a332c13ad4389652a016d7a824f7
4RMD160 (parrot-1.0.0.tar.gz) = 46f60accd33f16cc910f4ea03840badc358d22c7 4RMD160 (parrot-1.0.0.tar.gz) = 46f60accd33f16cc910f4ea03840badc358d22c7
5Size (parrot-1.0.0.tar.gz) = 3908888 bytes 5Size (parrot-1.0.0.tar.gz) = 3908888 bytes
6SHA1 (patch-aa) = b3ad6ae9acbd8f25682395933fe48209b50a9752 6SHA1 (patch-aa) = b3ad6ae9acbd8f25682395933fe48209b50a9752
7SHA1 (patch-ab) = d00168e31daff02ca0ccaec532f029ff7d0126e6 7SHA1 (patch-ab) = d58ab8a52dc844069e318f8442d5325a3afad876
8SHA1 (patch-ac) = 5e2875b46aa390fc512bf22001146a4a470ae192 8SHA1 (patch-ac) = 5e2875b46aa390fc512bf22001146a4a470ae192
9SHA1 (patch-ad) = 9002a7ca55f8f960bea669e383431b3eeb83a878 9SHA1 (patch-ad) = 9002a7ca55f8f960bea669e383431b3eeb83a878
10SHA1 (patch-ae) = 72e4752112dab2f0b72ede5c45b77fd5b5554606 10SHA1 (patch-ae) = 72e4752112dab2f0b72ede5c45b77fd5b5554606
cvs diff -r1.5 -r1.6 pkgsrc/lang/parrot/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/parrot/patches/Attic/patch-ab 2009/04/17 19:54:39 1.5
+++ pkgsrc/lang/parrot/patches/Attic/patch-ab 2009/04/17 22:08:44 1.6
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-ab,v 1.5 2009/04/17 19:54:39 he Exp $ 1$NetBSD: patch-ab,v 1.6 2009/04/17 22:08:44 he Exp $
2 2
3The R_PPC_ADDR16{HI,LO} constants are named something else on 3The R_PPC_ADDR16{HI,LO} constants are named something else on
4NetBSD, and might be elsewhere. 4NetBSD, and might be elsewhere.
5Also add workarounds for NetBSD/powerpc 3.x, which has a minimal 5Also add workarounds for NetBSD/powerpc 3.x, which has some
6<powerpc/elf_machdep.h> file. 6constants defined as enums.
7 7
8--- src/exec_save.c.orig 2009-03-08 20:32:43.000000000 +0000 8--- src/exec_save.c.orig 2009-03-08 20:32:43.000000000 +0000
9+++ src/exec_save.c 9+++ src/exec_save.c
10@@ -30,6 +30,26 @@ static void save_int(FILE *fp, int i); 10@@ -30,6 +30,26 @@ static void save_int(FILE *fp, int i);
11 static void save_short(FILE *fp, short s); 11 static void save_short(FILE *fp, short s);
12 static void save_struct(FILE *fp, void *sp, size_t size); 12 static void save_struct(FILE *fp, void *sp, size_t size);
13  13
14+#if defined(PARROT_PPC) 14+#if defined(PARROT_PPC)
15+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \ 15+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
16+ defined(R_PPC_16_HI) && defined(R_PPC_16_LO) 16+ defined(R_PPC_16_HI) && defined(R_PPC_16_LO)
17+# define R_PPC_ADDR16_HI R_PPC_16_HI 17+# define R_PPC_ADDR16_HI R_PPC_16_HI
18+# define R_PPC_ADDR16_LO R_PPC_16_LO 18+# define R_PPC_ADDR16_LO R_PPC_16_LO
19+#endif 19+#endif
20+/* 20+/*
21+ * NetBSD/powerpc 3.x doesn't define these constants, 21+ * NetBSD/powerpc 3.x doesn't define these constants,
22+ * so add some workarounds for it. 22+ * but instead has them as enums, so add some workarounds for it.
23+ */ 23+ */
24+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \ 24+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
25+ defined(__NetBSD__) 25+ defined(__NetBSD__)
26+# define R_PPC_ADDR16_HI 5 26+# define R_PPC_ADDR16_HI RELOC_16_HI
27+# define R_PPC_ADDR16_LO 4 27+# define R_PPC_ADDR16_LO RELOC_16_LO
28+#endif 28+#endif
29+#if !defined(R_PPC_REL24) && defined(__NetBSD__) 29+#if !defined(R_PPC_REL24) && defined(__NetBSD__)
30+# define R_PPC_REL24 10 30+# define R_PPC_REL24 RELOC_REL24
31+#endif 31+#endif
32+#endif /* PARROT_PPC */ 32+#endif /* PARROT_PPC */
33+ 33+
34 #ifdef EXEC_A_OUT 34 #ifdef EXEC_A_OUT
35  35
36 # include <a.out.h> 36 # include <a.out.h>