add alpha support to -r8

5 files changed, 72 insertions, 36 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f44b1a2242b7..db41a00f8cf3 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.100 2003/10/28 13:11:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.101 2003/11/02 04:51:15 agriffis Exp $
+
+  01 Nov 2003; Aron Griffis <agriffis@gentoo.org> glibc-2.3.2-r8.ebuild,
+  files/2.3.2/glibc-2.3.2-alpha-crti.patch,
+  files/2.3.2/glibc-2.3.2-alpha-pwrite.patch:
+  Add crti and pwrite patches for alpha
 
   28 Oct 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r8.ebuild :
   Added depend to >=hppa-headers-2.4.21_p13 for succefull compilation.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 17019d56ec8c..c937084bc40d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,33 +1,31 @@
-MD5 f607edfc35cd1680e0d73c9ec36fb186 ChangeLog 20133
+MD5 b452813e95f2a62bff4af50c13ed4953 ChangeLog 20339
+MD5 faecaafd64455df8f1a0b21b657581a3 glibc-2.3.2-r2.ebuild 17616
+MD5 ab0a1721ea8e94d8a41ca3475b8751f6 glibc-2.3.2-r8.ebuild 18625
 MD5 ec652c5641efa40df96db52e3b00f91e glibc-2.2.5-r8.ebuild 9682
 MD5 2bc486046719b9115a9dbdd4aa73668c glibc-2.3.1-r4.ebuild 10438
 MD5 88021b4211f0c76913f19672c3e76043 glibc-2.3.2-r1.ebuild 16468
-MD5 faecaafd64455df8f1a0b21b657581a3 glibc-2.3.2-r2.ebuild 17616
 MD5 7b69920e93b5e834be4827c9223d021d glibc-2.3.2-r6.ebuild 17144
 MD5 6b445d28bca46cd31b2d20b82c5a6dd6 glibc-2.3.2-r7.ebuild 16935
-MD5 3a548a1c2fd401b8296c961a6d1bb360 glibc-2.3.2-r8.ebuild 18453
-MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r8 143
-MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r4 141
-MD5 d796f62cfd60f02f27441060ac807b5a files/digest-glibc-2.3.2-r1 213
 MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
-MD5 ea18d8c31d6d60421fd2b8dace6af470 files/digest-glibc-2.3.2-r6 295
-MD5 096b2f195c14482b91b1845e2d8177bf files/digest-glibc-2.3.2-r7 233
-MD5 28b40cc815955bcf93af44886d72b018 files/digest-glibc-2.3.2-r8 233
-MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
 MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
-MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
 MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r8 143
+MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r4 141
+MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
+MD5 d796f62cfd60f02f27441060ac807b5a files/digest-glibc-2.3.2-r1 213
+MD5 28b40cc815955bcf93af44886d72b018 files/digest-glibc-2.3.2-r8 233
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+MD5 ea18d8c31d6d60421fd2b8dace6af470 files/digest-glibc-2.3.2-r6 295
+MD5 096b2f195c14482b91b1845e2d8177bf files/digest-glibc-2.3.2-r7 233
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
-MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
-MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
 MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
 MD5 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
@@ -42,21 +40,22 @@ MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.dif
 MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636
 MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
 MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
+MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
+MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
 MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
-MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
+MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
+MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
+MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
+MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
 MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
 MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
-MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
 MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
 MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
 MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
-MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
-MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
 MD5 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
-MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
 MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
 MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
 MD5 b8f6b8b0ed8649fc9af439adef7472f2 files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
@@ -68,12 +67,22 @@ MD5 2b746db4988cf7f5c6824302561b7eb5 files/2.3.1/glibc23-06-hppa-tests.dpatch 21
 MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
 MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
 MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
-MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
-MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
-MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
+MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
 MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
-MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
 MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
+MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
+MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
+MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
+MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
+MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
+MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
+MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
+MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 MD5 c247b202d75dfdc8185726a173919046 files/2.3.2/glibc-2.3.2-hppa-00-pthreads.patch 8148
 MD5 16682916a0be69a76deff050aab4733d files/2.3.2/glibc-2.3.2-hppa-01-sysdeps-pthreads.patch 1858
 MD5 e7fe84ec2b4e3593ccb8315088ec1fd2 files/2.3.2/glibc-2.3.2-hppa-02-pthreads.patch 3112
@@ -93,12 +102,5 @@ MD5 21de46f362c277795f70e83e60f937fe files/2.3.2/glibc-2.3.2-hppa-16-prototypes.
 MD5 fb1ed429f34337000ddf3f5ec4d5c179 files/2.3.2/glibc-2.3.2-hppa-17-casts.patch 500
 MD5 c23a91d7ba2633b4767296efa9dc2983 files/2.3.2/glibc-2.3.2-hppa-18-sgu.patch 845
 MD5 24d102942b2859e6e0f40af371745f9c files/2.3.2/glibc-2.3.2-hppa-19-cancel.patch 622
-MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
-MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
-MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
-MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
-MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
-MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
-MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
-MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
-MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
+MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
+MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-crti.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-crti.patch
new file mode 100644
index 000000000000..2ec179099bb7
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-crti.patch
@@ -0,0 +1,10 @@
+--- glibc-2.3.2/linuxthreads/sysdeps/alpha/elf/pt-initfini.c.old	2003-11-01 17:55:51.000000000 -0500
++++ glibc-2.3.2/linuxthreads/sysdeps/alpha/elf/pt-initfini.c	2003-11-01 20:17:04.000000000 -0500
+@@ -75,7 +75,6 @@
+ 	subq	$30, 16, $30				\n\
+ 	stq	$26, 0($30)				\n\
+ 	stq	$29, 8($30)				\n\
+-	.prologue 1					\n\
+ 	.align 3					\n\
+ /*@_fini_PROLOG_ENDS*/					\n\
+ 							\n\
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-pwrite.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-pwrite.patch
new file mode 100644
index 000000000000..ab563aae6e13
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-alpha-pwrite.patch
@@ -0,0 +1,13 @@
+--- glibc-2.3.2/sysdeps/unix/sysv/linux/alpha/syscalls.list.old	2003-11-01 19:21:19.000000000 -0500
++++ glibc-2.3.2/sysdeps/unix/sysv/linux/alpha/syscalls.list	2003-11-01 19:21:25.000000000 -0500
+@@ -22,8 +22,8 @@
+ llseek		EXTRA	lseek		C:3	__libc_lseek	__lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+ lseek		llseek	-
+ posix_fadvise64	-	fadvise64	Vi:iiii	posix_fadvise64	posix_fadvise
+-pread		-	pread64		C:4	__libc_pread	__libc_pread64 __pread pread __pread64 pread64
+-pwrite		-	pwrite64		C:4	__libc_pwrite	__libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
++pread		-	pread		C:4	__libc_pread	__libc_pread64 __pread pread __pread64 pread64
++pwrite		-	pwrite		C:4	__libc_pwrite	__libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
+ fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs __fstatfs64 fstatfs64
+ statfs		-	statfs		i:sp	__statfs	statfs statfs64
+ getrlimit	-	getrlimit	2	__getrlimit	getrlimit getrlimit64
diff --git a/sys-libs/glibc/glibc-2.3.2-r8.ebuild b/sys-libs/glibc/glibc-2.3.2-r8.ebuild
index b19e533f249e..47fa5de9afd5 100644
--- a/sys-libs/glibc/glibc-2.3.2-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r8.ebuild,v 1.5 2003/10/28 13:11:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r8.ebuild,v 1.6 2003/11/02 04:51:15 agriffis Exp $
 
 IUSE="nls pic build nptl"
 
@@ -53,7 +53,7 @@ SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2
 	mirror://gentoo/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
-KEYWORDS="-* ~x86 ~sparc ~amd64 ~hppa"
+KEYWORDS="-* ~x86 ~sparc ~amd64 ~hppa ~alpha"
 # Is 99% compadible, just some .a's bork
 SLOT="2.2"
 LICENSE="LGPL-2"
@@ -325,10 +325,16 @@ src_unpack() {
 
 	if [ "${ARCH}" = "alpha" ]
 	then
+		cd ${S}
+
 		# Fix compatability with compaq compilers by ifdef'ing out some
 		# 2.3.2 additions.
 		# <taviso@gentoo.org> (14 Jun 2003).
-		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-decc-compaq.patch
+		epatch ${FILESDIR}/2.3.2/${P}-decc-compaq.patch
+
+		# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
+		epatch ${FILESDIR}/2.3.2/${P}-alpha-pwrite.patch
+		epatch ${FILESDIR}/2.3.2/${P}-alpha-crti.patch
 	fi
 
 	if [ "${ARCH}" = "amd64" ]