Wed Dec 29 03:26:32 2021 UTC ()
emacs20: Fix broken build on alpha.


(dholland)
diff -r1.40 -r1.41 pkgsrc/editors/emacs20/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-br
cvs diff -r1.40 -r1.41 pkgsrc/editors/emacs20/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/distinfo 2021/12/25 22:11:50 1.40
+++ pkgsrc/editors/emacs20/distinfo 2021/12/29 03:26:32 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.40 2021/12/25 22:11:50 dholland Exp $ 1$NetBSD: distinfo,v 1.41 2021/12/29 03:26:32 dholland Exp $
2 2
3BLAKE2s (emacs-20.7-mule-4.1b-elc.tar.gz) = 8d3116a8037014bdeece76148aeb0ae72adcb003fd67922650793302197d62bf 3BLAKE2s (emacs-20.7-mule-4.1b-elc.tar.gz) = 8d3116a8037014bdeece76148aeb0ae72adcb003fd67922650793302197d62bf
4SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4 4SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4
5Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes 5Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
6BLAKE2s (emacs-20.7-mule-4.1b.patch) = 1283ace8a636908265f84a0b6dc4bb08ed5de4a5518b0ea5a6d6b63c1e557ebd 6BLAKE2s (emacs-20.7-mule-4.1b.patch) = 1283ace8a636908265f84a0b6dc4bb08ed5de4a5518b0ea5a6d6b63c1e557ebd
7SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368 7SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368
8Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes 8Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
9BLAKE2s (emacs-20.7.tar.gz) = 42da52d0764c5ab4dc82919a2515fefa5b74205e33a56e8eef5833b3b1943538 9BLAKE2s (emacs-20.7.tar.gz) = 42da52d0764c5ab4dc82919a2515fefa5b74205e33a56e8eef5833b3b1943538
10SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a 10SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a
11Size (emacs-20.7.tar.gz) = 15043428 bytes 11Size (emacs-20.7.tar.gz) = 15043428 bytes
12BLAKE2s (emacs20-jumbo-patch-20170723.gz) = 9fdb9668672d92389fdbec8ce5b2114bee640d38a2afc7e0b972772faa89fbe1 12BLAKE2s (emacs20-jumbo-patch-20170723.gz) = 9fdb9668672d92389fdbec8ce5b2114bee640d38a2afc7e0b972772faa89fbe1
13SHA512 (emacs20-jumbo-patch-20170723.gz) = b54b8a88c8c938cddcc4011a548f739458b143581a0e32f813d2b69ceeba95b068613ccea9495924d3207e43707184249726e13f7699cf6f0bb3f9345af29749 13SHA512 (emacs20-jumbo-patch-20170723.gz) = b54b8a88c8c938cddcc4011a548f739458b143581a0e32f813d2b69ceeba95b068613ccea9495924d3207e43707184249726e13f7699cf6f0bb3f9345af29749
14Size (emacs20-jumbo-patch-20170723.gz) = 2463 bytes 14Size (emacs20-jumbo-patch-20170723.gz) = 2463 bytes
@@ -34,24 +34,24 @@ SHA1 (patch-ay) = bc91b0759ce0b3f3c1be54 @@ -34,24 +34,24 @@ SHA1 (patch-ay) = bc91b0759ce0b3f3c1be54
34SHA1 (patch-az) = a53cdfdb21e773986c9ffd2fd46e3331471ea892 34SHA1 (patch-az) = a53cdfdb21e773986c9ffd2fd46e3331471ea892
35SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f 35SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
36SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167 36SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
37SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 37SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
38SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346 38SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
39SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254 39SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
40SHA1 (patch-bg) = 5115064efe54800923677304161f46ade379b3b0 40SHA1 (patch-bg) = 5115064efe54800923677304161f46ade379b3b0
41SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a 41SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
42SHA1 (patch-bi) = c0e237bd46de0f9ef137997e59231f119d5f791e 42SHA1 (patch-bi) = c0e237bd46de0f9ef137997e59231f119d5f791e
43SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2 43SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
44SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13 44SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
45SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54 45SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
46SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91 46SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
47SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e 47SHA1 (patch-br) = f8b100fda2e3eb1ea8da4af3ba45e6dba1f8807c
48SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a 48SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
49SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92 49SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
50SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b 50SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
51SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d 51SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
52SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b 52SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
53SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb 53SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
54SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2 54SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
55SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e 55SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
56SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4 56SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4
57SHA1 (patch-src_m_aarch64.h) = 861757ce6568303ea55cb9c9f290abc6100d3dc2 57SHA1 (patch-src_m_aarch64.h) = 861757ce6568303ea55cb9c9f290abc6100d3dc2
cvs diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-br (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-br 2003/04/11 00:31:45 1.1.1.1
+++ pkgsrc/editors/emacs20/patches/patch-br 2021/12/29 03:26:32 1.2
@@ -1,15 +1,38 @@ @@ -1,15 +1,38 @@
1$NetBSD: patch-br,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ 1$NetBSD: patch-br,v 1.2 2021/12/29 03:26:32 dholland Exp $
2 2
3--- src/m/alpha.h.orig Fri Feb 4 12:25:47 2000 3- Fix extra declarations of allocator functions that are out of sync
4+++ src/m/alpha.h Fri Jul 19 02:56:24 2002 4with the rest of the tree.
5@@ -147,7 +147,9 @@ 5
 6- Disable -fno-common on NetBSD (XXX why? The patch's original commit
 7message from 2002 says
 8 -fno-common is not necessary on NetBSD/alpha (or any ELF platform,
 9 really)
 10but I don't see why that's true given the associated comment, which
 11seems valid. (Or at least it is for alpha and mips, where non-library
 12code is built as PIC.)
 13
 14--- src/m/alpha.h.orig 2000-02-04 12:25:47.000000000 +0000
 15+++ src/m/alpha.h
 16@@ -147,7 +147,9 @@ NOTE-END
6 GNU libc, __malloc_initialized would normally be resolved to the 17 GNU libc, __malloc_initialized would normally be resolved to the
7 shared library's .bss section, which is fatal. */ 18 shared library's .bss section, which is fatal. */
8 # ifdef __GNUC__ 19 # ifdef __GNUC__
9-# define C_SWITCH_MACHINE -fno-common 20-# define C_SWITCH_MACHINE -fno-common
10+# ifndef __NetBSD__ 21+# ifndef __NetBSD__
11+# define C_SWITCH_MACHINE -fno-common 22+# define C_SWITCH_MACHINE -fno-common
12+# endif 23+# endif
13 # else 24 # else
14 # error What gives? Fix me if DEC Unix supports ELF now. 25 # error What gives? Fix me if DEC Unix supports ELF now.
15 # endif 26 # endif
 27@@ -279,8 +281,9 @@ extern long *xmalloc (), *xrealloc ();
 28 /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
 29 is allowed to prototype these as "void *" so we don't prototype in
 30 that case. You're right: it stinks! */
 31-extern char *r_alloc (), *r_re_alloc ();
 32-extern void r_alloc_free ();
 33+extern void *r_alloc(void *, unsigned long);
 34+extern void *r_re_alloc(void *, unsigned long);
 35+extern void r_alloc_free(void *);
 36 #endif /* not _MALLOC_INTERNAL */
 37 #endif /* REL_ALLOC */
 38