diff options
17 files changed, 228 insertions, 55 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index d3c5f9e4ea34..350457036be9 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.288 2004/11/05 16:38:28 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.289 2004/11/10 09:20:22 kumba Exp $ + + 10 Nov 2004; Joshua Kinard <kumba@gentoo.org> + +files/2.3.3/glibc-2.3.3-mips-addabi.diff, + +files/2.3.3/glibc-2.3.3-mips-nolib3264.diff, + +files/2.3.3/glibc-2.3.3-mips-semtimedop.diff, + +files/2.3.3/glibc-2.3.3-mips-syscall.h.diff, + +files/2.3.3/glibc-2.3.3-mips-sysify.diff, -files/2.3.3/mips-addabi.diff, + -files/2.3.3/mips-nolib3264.diff, -files/2.3.3/mips-syscall.h.diff, + -files/2.3.3/mips-sysify.diff, -files/2.3.3/semtimedop.diff, + +files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch, + +files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch, + +files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch, + +files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff, + +files/2.3.4/glibc-2.3.4-mips-update-__throw.patch, + -files/2.3.4/mips-sysdep-cancel.diff, glibc-2.3.3.20040420-r2.ebuild, + glibc-2.3.4.20040619-r2.ebuild, glibc-2.3.4.20040808-r1.ebuild, + glibc-2.3.4.20041021.ebuild, glibc-2.3.4.20041102.ebuild: + Renamed a few patches to better identify them for mips, masked 2.3.4.20041021, + and added a series of patches to 2.3.4.20041102 from libc-alpha ML that allows + it to build and usable. Also re-added use of the librt patchs to fix a + run-time error. 05 Nov 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041102.ebuild: keywording as ~amd64, ~ppc64, ~ia64, and ~x86. added ~ppc keyword thanks to diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 833fadfa7431..d53ffa711959 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,13 +1,17 @@ +MD5 e3c5c4647f42d636981de2eb36cbd4d1 ChangeLog 61354 MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915 +MD5 4e720614a25ef32301144378b43bb4f3 glibc-2.3.3.20040420-r2.ebuild 21825 +MD5 8d5e1a8868946e37bff4d7fcd2c095d9 glibc-2.3.4.20040619-r2.ebuild 21057 +MD5 ba5e56d9eaf4623f37ddf50a4eef3e6c glibc-2.3.4.20041021.ebuild 26977 MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530 -MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765 -MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 ac8cbd194b0e622f368f12f876f732a7 glibc-2.3.4.20040808-r1.ebuild 23089 -MD5 31676fe04143bd4fb9919db2d97debcb glibc-2.3.4.20041021.ebuild 26923 -MD5 ab8417c2ae61f77874434ba08169502a glibc-2.3.4.20041102.ebuild 26651 -MD5 0bfe280f3958086e9098d57ee0626324 ChangeLog 60165 +MD5 d661758bc66b5e54f4ae1131842e4e5c glibc-2.3.4.20041102.ebuild 27048 +MD5 af5f8da4036fb2bf69a6e5322fc31d58 glibc-2.3.4.20040808-r1.ebuild 23137 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 +MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 +MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307 +MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382 +MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 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 @@ -21,11 +25,7 @@ MD5 bedcd868a9462009158714238594173c files/nscd 964 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54 -MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 -MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 MD5 123d66ef523985c88c77af1ab1fc2d56 files/digest-glibc-2.3.4.20041021 383 -MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307 -MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382 MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102 383 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 @@ -102,31 +102,35 @@ MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax. MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431 MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497 MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287 -MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720 -MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166 -MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199 -MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138 -MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602 +MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199 +MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138 MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041 MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787 +MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720 +MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166 +MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602 MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037 MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382 MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310 MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562 MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140 -MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304 MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347 -MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402 +MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304 MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443 -MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080 MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854 +MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080 MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230 +MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272 MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417 -MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288 MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337 -MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272 +MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288 MD5 edcaf42f72d84a2cbbd911bfbcd4161a files/2.3.4/host.conf 1300 -MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809 MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449 MD5 1974267b1382fb38be7495b12c847f70 files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch 372 +MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809 +MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw.patch 1975 +MD5 03b2b9cfe46d287c2a28df70e7a9e9a1 files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch 1410 +MD5 8d43dc97fe220048ade220f23e84f006 files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch 1425 +MD5 41cec3deb89ffdbd670024a2b615b819 files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch 1196 +MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff 2402 diff --git a/sys-libs/glibc/files/2.3.3/mips-addabi.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-addabi.diff index 692e0e114985..692e0e114985 100644 --- a/sys-libs/glibc/files/2.3.3/mips-addabi.diff +++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-addabi.diff diff --git a/sys-libs/glibc/files/2.3.3/mips-nolib3264.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-nolib3264.diff index eb4fed8e656d..eb4fed8e656d 100644 --- a/sys-libs/glibc/files/2.3.3/mips-nolib3264.diff +++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-nolib3264.diff diff --git a/sys-libs/glibc/files/2.3.3/semtimedop.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-semtimedop.diff index 47132afd11b8..47132afd11b8 100644 --- a/sys-libs/glibc/files/2.3.3/semtimedop.diff +++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-semtimedop.diff diff --git a/sys-libs/glibc/files/2.3.3/mips-syscall.h.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-syscall.h.diff index fdbd3b9058bc..fdbd3b9058bc 100644 --- a/sys-libs/glibc/files/2.3.3/mips-syscall.h.diff +++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-syscall.h.diff diff --git a/sys-libs/glibc/files/2.3.3/mips-sysify.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-sysify.diff index 09b1adbb6fbc..09b1adbb6fbc 100644 --- a/sys-libs/glibc/files/2.3.3/mips-sysify.diff +++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-mips-sysify.diff diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch new file mode 100644 index 000000000000..f146679646f6 --- /dev/null +++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch @@ -0,0 +1,36 @@ +2004-11-08 Richard Sandiford <rsandifo@redhat.com> + + * sysdeps/mips/sys/regdef.h: Include #include <sgidefs.h> + * sysdeps/mips/sys/ucontext.h: Likewise. + +Index: sysdeps/mips/sys/regdef.h +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/mips/sys/regdef.h,v +retrieving revision 1.4 +diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.4 regdef.h +--- sysdeps/mips/sys/regdef.h 9 Apr 2003 02:51:04 -0000 1.4 ++++ sysdeps/mips/sys/regdef.h 28 Oct 2004 12:57:20 -0000 +@@ -20,6 +20,8 @@ + #ifndef _SYS_REGDEF_H + #define _SYS_REGDEF_H + ++#include <sgidefs.h> ++ + /* + * Symbolic register names for 32 bit ABI + */ +Index: sysdeps/mips/sys/ucontext.h +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/mips/sys/ucontext.h,v +retrieving revision 1.4 +diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.4 ucontext.h +--- sysdeps/mips/sys/ucontext.h 17 Mar 2003 15:47:12 -0000 1.4 ++++ sysdeps/mips/sys/ucontext.h 28 Oct 2004 12:57:20 -0000 +@@ -23,6 +23,7 @@ #define _SYS_UCONTEXT_H 1 + + #include <features.h> + #include <signal.h> ++#include <sgidefs.h> + + /* Type for general register. */ + #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch new file mode 100644 index 000000000000..cba618ca44b8 --- /dev/null +++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch @@ -0,0 +1,32 @@ +2004-10-18 Maciej W. Rozycki <macro@mips.com> + + * sysdeps/unix/sysv/linux/mips/bits/mman.h (PROT_GROWSDOWN): + Define. + (PROT_GROWSUP): Likewise. + + Please apply. + + Maciej + +glibc-2.3.3-20041018-mips-prot_grows-1 +diff -up --recursive --new-file glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/bits/mman.h glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/bits/mman.h +--- glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/bits/mman.h Sat Mar 8 03:26:00 2003 ++++ glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/bits/mman.h Mon Oct 18 14:48:57 2004 +@@ -1,5 +1,5 @@ + /* Definitions for POSIX memory map interface. Linux/MIPS version. +- Copyright (C) 1997, 2000, 2003 Free Software Foundation, Inc. ++ Copyright (C) 1997, 2000, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -34,6 +34,10 @@ + #define PROT_WRITE 0x2 /* Page can be written. */ + #define PROT_EXEC 0x4 /* Page can be executed. */ + #define PROT_NONE 0x0 /* Page can not be accessed. */ ++#define PROT_GROWSDOWN 0x01000000 /* Extend change to start of ++ growsdown vma (mprotect only). */ ++#define PROT_GROWSUP 0x02000000 /* Extend change to start of ++ growsup vma (mprotect only). */ + + /* Sharing types (must choose one and only one of these). */ + #define MAP_SHARED 0x01 /* Share changes. */ diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch new file mode 100644 index 000000000000..16080393025d --- /dev/null +++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch @@ -0,0 +1,31 @@ +2004-10-18 Maciej W. Rozycki <macro@mips.com> + + * sysdeps/mips/bits/dlfcn.h (RTLD_DEEPBIND): Define. + + Please apply. + + Maciej + +glibc-2.3.3-20041018-mips-rtld_deepbind-2.patch +diff -up --recursive --new-file glibc-2.3.3-20041018.macro/sysdeps/mips/bits/dlfcn.h glibc-2.3.3-20041018/sysdeps/mips/bits/dlfcn.h +--- glibc-2.3.3-20041018.macro/sysdeps/mips/bits/dlfcn.h Sat Oct 27 02:25:51 2001 ++++ glibc-2.3.3-20041018/sysdeps/mips/bits/dlfcn.h Mon Oct 18 16:21:44 2004 +@@ -1,5 +1,6 @@ + /* System dependent definitions for run-time dynamic loading. +- Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. ++ Copyright (C) 1996, 1997, 1999, 2000, 2001, 2004 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -24,8 +25,9 @@ + /* The MODE argument to `dlopen' contains one of the following: */ + #define RTLD_LAZY 0x0001 /* Lazy function call binding. */ + #define RTLD_NOW 0x0002 /* Immediate function call binding. */ +-#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */ ++#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */ + #define RTLD_NOLOAD 0x00008 /* Do not load the object. */ ++#define RTLD_DEEPBIND 0x00010 /* Use deep binding. */ + + /* If the following bit is set in the MODE argument to `dlopen', + the symbols of the loaded object and its dependencies are made diff --git a/sys-libs/glibc/files/2.3.4/mips-sysdep-cancel.diff b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff index 0e70b8ddf1ad..0e70b8ddf1ad 100644 --- a/sys-libs/glibc/files/2.3.4/mips-sysdep-cancel.diff +++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-update-__throw.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-update-__throw.patch new file mode 100644 index 000000000000..a2c14886c13c --- /dev/null +++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-mips-update-__throw.patch @@ -0,0 +1,44 @@ +2004-10-18 Maciej W. Rozycki <macro@mips.com> + + * sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Use + __NTH instead of __THROW in the inline definition. + * sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): + Likewise. + + Please apply. + + Maciej + +glibc-2.3.3-20041018-mips-nth-1.patch +diff -up --recursive --new-file glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/bits/socket.h glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/bits/socket.h +--- glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/bits/socket.h Thu Sep 27 02:25:58 2001 ++++ glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/bits/socket.h Mon Oct 18 13:12:39 2004 +@@ -1,5 +1,6 @@ + /* System-specific socket constants and types. Linux/MIPS version. +- Copyright (C) 1991,92,1994-1999,2000,2001 Free Software Foundation, Inc. ++ Copyright (C) 1991, 92, 1994-1999, 2000, 2001, 2004 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -261,7 +262,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st + # define _EXTERN_INLINE extern __inline + # endif + _EXTERN_INLINE struct cmsghdr * +-__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW ++__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) + { + if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr)) + /* The kernel header does this so there may be a reason. */ +diff -up --recursive --new-file glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/sys/tas.h glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/sys/tas.h +--- glibc-2.3.3-20041018.macro/sysdeps/unix/sysv/linux/mips/sys/tas.h Wed Jul 21 01:26:43 2004 ++++ glibc-2.3.3-20041018/sysdeps/unix/sysv/linux/mips/sys/tas.h Mon Oct 18 11:18:56 2004 +@@ -35,7 +35,7 @@ extern int _test_and_set (int *p, int v) + # endif + + _EXTERN_INLINE int +-_test_and_set (int *p, int v) __THROW ++__NTH (_test_and_set (int *p, int v)) + { + int r, t; + diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild index bb433949d791..7305e23f2eae 100644 --- a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.2 2004/11/10 09:20:22 kumba Exp $ inherit eutils flag-o-matic gcc @@ -407,11 +407,11 @@ src_unpack() { epatch ${FILESDIR}/2.3.2/${LOCAL_P}-mips-configure-for-n64-symver.patch epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff - epatch ${FILESDIR}/2.3.3/mips-addabi.diff - epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff - epatch ${FILESDIR}/2.3.3/semtimedop.diff - epatch ${FILESDIR}/2.3.3/mips-sysify.diff -##### epatch ${FILESDIR}/2.3.3/mips-n32n64regs.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-semtimedop.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff +##### epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-n32n64regs.diff fi if [ "${ARCH}" = "alpha" ] diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild index 06156e1999ec..41f8f7f0f1fb 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.2 2004/11/10 09:20:22 kumba Exp $ inherit eutils flag-o-matic gcc @@ -378,13 +378,13 @@ do_arch_mips_patches() { epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff - epatch ${FILESDIR}/2.3.3/mips-addabi.diff - epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff - epatch ${FILESDIR}/2.3.3/semtimedop.diff - epatch ${FILESDIR}/2.3.3/mips-sysify.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-semtimedop.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff if use n32 || use n64; then - epatch ${FILESDIR}/2.3.4/mips-sysdep-cancel.diff + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-sysdep-cancel.diff fi # Need to install into /lib for n32-only userland for now. diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild index 22fe3396a9bb..d8efb10d354e 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.10 2004/10/19 19:52:14 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.11 2004/11/10 09:20:22 kumba Exp $ inherit eutils flag-o-matic gcc @@ -364,13 +364,13 @@ do_arch_mips_patches() { # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) # <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches # <iluxa@gentoo.org> add n32/n64 patches, remove pread patch - epatch ${FILESDIR}/2.3.3/mips-addabi.diff - epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff - epatch ${FILESDIR}/2.3.3/mips-sysify.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff # Need to install into /lib for n32-only userland for now. # Propper solution is to make all userland /lib{32|64}-aware. - use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff + use multilib || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-nolib3264.diff # Found this on Google (yay google!) and it fixes glibc not building # a correct bits/syscall.h from 2.6.x headers. It possibly breaks older diff --git a/sys-libs/glibc/glibc-2.3.4.20041021.ebuild b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild index 97ec45cfc3d8..4a3f8b141ca2 100644 --- a/sys-libs/glibc/glibc-2.3.4.20041021.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041021.ebuild,v 1.7 2004/11/05 14:04:45 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041021.ebuild,v 1.8 2004/11/10 09:20:22 kumba Exp $ inherit eutils flag-o-matic gcc @@ -40,7 +40,7 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2 LICENSE="LGPL-2" SLOT="2.2" -KEYWORDS="-* ~amd64 -hppa ~ia64 -ppc ~ppc64 ~x86" +KEYWORDS="-* ~amd64 -hppa ~ia64 -ppc ~ppc64 ~x86 -mips" IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales" RESTRICT="nostrip" # we'll handle stripping ourself #46186 @@ -378,13 +378,13 @@ do_arch_mips_patches() { # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) # <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches # <iluxa@gentoo.org> add n32/n64 patches, remove pread patch - epatch ${FILESDIR}/2.3.3/mips-addabi.diff - epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff - epatch ${FILESDIR}/2.3.3/mips-sysify.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff # Need to install into /lib for n32-only userland for now. # Propper solution is to make all userland /lib{32|64}-aware. - use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff + use multilib || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-nolib3264.diff } diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index 85a31fc7f3fc..215f958c1094 100644 --- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.3 2004/11/05 16:38:28 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.4 2004/11/10 09:20:22 kumba Exp $ inherit eutils flag-o-matic gcc versionator @@ -40,7 +40,7 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2 LICENSE="LGPL-2" SLOT="2.2" -KEYWORDS="~amd64 ~ppc64 -hppa ~ia64 ~ppc ~x86 -*" +KEYWORDS="~amd64 ~ppc64 -hppa ~ia64 ~ppc ~x86 ~mips -*" IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck" RESTRICT="nostrip" # we'll handle stripping ourself #46186 @@ -348,17 +348,22 @@ do_arch_mips_patches() { cd ${S} # A few patches only for the MIPS platform. Descriptions of what they - # do can be found in the patch headers. - # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) - # <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches - # <iluxa@gentoo.org> add n32/n64 patches, remove pread patch - epatch ${FILESDIR}/2.3.3/mips-addabi.diff - epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff - epatch ${FILESDIR}/2.3.3/mips-sysify.diff + # do can (probably) be found in the patch headers. + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff + epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-semtimedop.diff + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-update-__throw.patch + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-prot_grows-undefined.patch + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-rtld_deepbind-undefined.patch + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-add-missing-sgidefs_h.patch + epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-add-glibc_2.0-to-librt.patch # Need to install into /lib for n32-only userland for now. # Propper solution is to make all userland /lib{32|64}-aware. - use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff + use multilib || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-nolib3264.diff } |