# ChangeLog for sys-libs/glibc
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.18 2002/10/13 12:44:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.19 2002/10/13 21:15:56 azarah Exp $
*glibc-2.2.5-r7 (13 Oct 2002)
13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild :
+ Some cleanups. Tidy ebuild. Move all patches to ${FILESDIR}/${PV/.
+ Remove old patches.
+
+ 13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild :
+
Fix stupid depend screwup I made when I merged in fixes from glibc-2.3.
11 Oct 2002; Seemant Kulleen <seemant@gentoo.org> glibc-2.2.5-r7.ebuild
--- /dev/null
+diff -uNr glibc-2.2.5.orig/iconv/skeleton.c glibc-2.2.5/iconv/skeleton.c
+--- glibc-2.2.5.orig/iconv/skeleton.c 2001-07-06 14:54:47.000000000 +1000
++++ glibc-2.2.5/iconv/skeleton.c 2002-08-09 20:28:32.000000000 +1000
+@@ -193,15 +193,20 @@
+ character set we can define RESET_INPUT_BUFFER in a very fast way. */
+ #if !defined RESET_INPUT_BUFFER && !defined SAVE_RESET_STATE
+ # if MIN_NEEDED_FROM == MAX_NEEDED_FROM && MIN_NEEDED_TO == MAX_NEEDED_TO
+-/* We have to use these `if's here since the compiler cannot know that
+- (outbuf - outerr) is always divisible by MIN_NEEDED_TO. */
+-# define RESET_INPUT_BUFFER \
+- if (MIN_NEEDED_FROM % MIN_NEEDED_TO == 0) \
+- *inptrp -= (outbuf - outerr) * (MIN_NEEDED_FROM / MIN_NEEDED_TO); \
+- else if (MIN_NEEDED_TO % MIN_NEEDED_FROM == 0) \
+- *inptrp -= (outbuf - outerr) / (MIN_NEEDED_TO / MIN_NEEDED_FROM); \
+- else \
+- *inptrp -= ((outbuf - outerr) / MIN_NEEDED_TO) * MIN_NEEDED_FROM
++/* We have to use these `#if's here since the compiler cannot know that
++ (outbuf - outerr) is always divisible by MIN_NEEDED_TO. We have to
++ use preprocessor arithmetic and no C code because gcc 3.2 complains
++ about division by zero even in obviously dead code. */
++# if MIN_NEEDED_FROM % MIN_NEEDED_TO == 0
++# define RESET_INPUT_BUFFER \
++ *inptrp -= (outbuf - outerr) * (MIN_NEEDED_FROM / MIN_NEEDED_TO)
++# elif MIN_NEEDED_TO % MIN_NEEDED_FROM == 0
++# define RESET_INPUT_BUFFER \
++ *inptrp -= (outbuf - outerr) / (MIN_NEEDED_TO / MIN_NEEDED_FROM)
++# else
++# define RESET_INPUT_BUFFER \
++ *inptrp -= ((outbuf - outerr) / MIN_NEEDED_TO) * MIN_NEEDED_FROM
++# endif
+ # endif
+ #endif
+
--- /dev/null
+diff -uNr glibc-2.2.5.orig/posix/regex.h glibc-2.2.5/posix/regex.h
+--- glibc-2.2.5.orig/posix/regex.h 2001-07-06 14:55:38.000000000 +1000
++++ glibc-2.2.5/posix/regex.h 2002-08-09 20:06:19.000000000 +1000
+@@ -529,10 +529,14 @@
+ # endif
+ # endif
+ #endif
+-/* For now unconditionally define __restrict_arr to expand to nothing.
+- Ideally we would have a test for the compiler which allows defining
+- it to restrict. */
+-#define __restrict_arr
++/* gcc 3.1 and up support the [restrict] syntax. */
++#ifndef __restrict_arr
++# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
++# define __restrict_arr __restrict
++# else
++# define __restrict_arr
++# endif
++#endif
+
+ /* POSIX compatibility. */
+ extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
+++ /dev/null
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
+++ /dev/null
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
+++ /dev/null
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
+++ /dev/null
---- configure.orig Tue Feb 27 20:01:42 2001
-+++ configure Tue Feb 27 20:01:53 2001
-@@ -3287,6 +3287,7 @@
-
- echo $ac_n "checking for libgd""... $ac_c" 1>&6
- echo "configure:3290: checking for libgd" >&5
-+if test "$with_gd" != "no"; then
- old_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $libgd_include"
- old_LDFLAGS="$LDFLAGS"
-@@ -3314,4 +3315,7 @@
- CFLAGS="$old_CFLAGS"
- LDFLAGS="$old_LDFLAGS"
- LIBS="$old_LIBS"
-+else
-+LIBGD="no"
-+fi
- echo "$ac_t""$LIBGD" 1>&6
+++ /dev/null
---- configure.orig Tue Feb 20 10:44:30 2001
-+++ configure.in Tue Feb 20 11:03:14 2001
-@@ -1324,6 +1324,7 @@
-
- dnl Check whether we have the gd library available.
- AC_MSG_CHECKING(for libgd)
-+if test "$with_gd" != "no"; then
- old_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $libgd_include"
- old_LDFLAGS="$LDFLAGS"
-@@ -1334,6 +1335,9 @@
- CFLAGS="$old_CFLAGS"
- LDFLAGS="$old_LDFLAGS"
- LIBS="$old_LIBS"
-+else
-+LIBGD="no"
-+fi
- AC_MSG_RESULT($LIBGD)
- AC_SUBST(LIBGD)
-
+++ /dev/null
---- intl/Makefile~ Fri Feb 9 19:04:07 2001
-+++ intl/Makefile Mon Apr 30 14:21:10 2001
-@@ -53,6 +53,7 @@
-
- ifeq (no,$(cross-compiling))
- ifeq (yes,$(build-shared))
-+ifneq (no,$(PERL))
- ifneq ($(strip $(MSGFMT)),:)
- tests: $(objpfx)mtrace-tst-gettext $(objpfx)tst-translit.out \
- $(objpfx)tst-gettext2.out
-@@ -65,6 +66,7 @@
- $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
- $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
- $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
-+endif
- endif
- endif
- endif
+++ /dev/null
---- malloc/Makefile~ Mon Feb 19 15:17:55 2001
-+++ malloc/Makefile Mon Feb 19 15:20:06 2001
-@@ -100,9 +100,11 @@
-
- ifeq (no,$(cross-compiling))
- ifeq (yes,$(build-shared))
-+ifneq (no,$(PERL))
- tests: $(objpfx)tst-mtrace.out
- $(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace
- $(SHELL) -e $< $(common-objpfx)
-+endif
- endif
- endif
-
+++ /dev/null
---- iconvdata/Makefile.orig Tue Feb 20 11:11:52 2001
-+++ iconvdata/Makefile Tue Feb 20 11:11:21 2001
-@@ -259,8 +259,10 @@
-
- ifeq (no,$(cross-compiling))
- ifeq (yes,$(build-shared))
--tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out \
-- $(objpfx)mtrace-tst-loading
-+tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out
-+ifneq (no,$(PERL))
-+tests: $(objpfx)mtrace-tst-loading
-+endif
- endif
- endif
-
+++ /dev/null
---- posix/Makefile~ Thu Feb 15 23:08:40 2001
-+++ posix/Makefile Tue Feb 27 23:26:10 2001
-@@ -139,7 +139,9 @@
- # XXX Please note that for now we ignore the result of this test.
- tests: $(objpfx)annexc.out
- ifeq (no,$(cross-compiling))
-+ifneq (no,$(PERL))
- tests:$(objpfx)bug-regex2-mem
-+endif
- endif
-
- $(objpfx)annexc.out: $(objpfx)annexc
+++ /dev/null
-RCS file: /cvs/glibc/libc/nis/nss-nis.h,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- nis/nss-nis.h 2001/04/26 13:43:15 1.2
-+++ nis/nss-nis.h 2001/04/28 02:17:52 1.3
-@@ -31,9 +31,9 @@
- static inline enum nss_status
- yperr2nss (int errval)
- {
-- if ((unsigned int) errval > __yperr2nss_count)
-+ if ((unsigned int) errval >= __yperr2nss_count)
- return NSS_STATUS_UNAVAIL;
-- return __yperr2nss_tab[errval];
-+ return __yperr2nss_tab[(unsigned int) errval];
- }
-
- #endif /* nis/nss-nis.h */
-Index: nis/nss-nisplus.h
-===================================================================
-RCS file: /cvs/glibc/libc/nis/nss-nisplus.h,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- nis/nss-nisplus.h 2001/04/26 13:52:40 1.4
-+++ nis/nss-nisplus.h 2001/04/28 02:19:00 1.5
-@@ -32,9 +32,9 @@
- static inline enum nss_status
- niserr2nss (int errval)
- {
-- if ((unsigned int) errval > __niserr2nss_count)
-+ if ((unsigned int) errval >= __niserr2nss_count)
- return NSS_STATUS_UNAVAIL;
-- return __niserr2nss_tab[errval];
-+ return __niserr2nss_tab[(unsigned int) errval];
- }
-
- #endif /* nis/nss-nisplus.h */
-Index: nis/Makefile
-===================================================================
---- nis/Makefile~ Tue May 8 04:08:19 2001
-+++ nis/Makefile Tue May 8 04:13:17 2001
-@@ -55,7 +55,7 @@
- nis_clone_res
-
- libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) \
-- nisplus-parser nss-nis
-+ nisplus-parser nss-nis nss-nisplus
- libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
-
- libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \
+++ /dev/null
---- string/bits/string2.h.old Tue Jun 12 12:52:46 2001
-+++ string/bits/string2.h Tue Jun 12 12:53:51 2001
-@@ -415,7 +415,7 @@
- break;
- case 3:
- __u->__usi = __src0_2;
-- __u = __extension__ ((void *) __u + 2);
-+ __u = __extension__ (void *)((char *) __u + 2);
- __u->__uc = '\0';
- break;
- case 4:
-@@ -423,24 +423,24 @@
- break;
- case 5:
- __u->__ui = __src0_4;
-- __u = __extension__ ((void *) __u + 4);
-+ __u = __extension__ (void *)((char *) __u + 4);
- __u->__uc = '\0';
- break;
- case 6:
- __u->__ui = __src0_4;
-- __u = __extension__ ((void *) __u + 4);
-+ __u = __extension__ (void *)((char *) __u + 4);
- __u->__usi = __src4_2;
- break;
- case 7:
- __u->__ui = __src0_4;
-- __u = __extension__ ((void *) __u + 4);
-+ __u = __extension__ (void *)((char *) __u + 4);
- __u->__usi = __src4_2;
-- __u = __extension__ ((void *) __u + 2);
-+ __u = __extension__ (void *)((char *) __u + 2);
- __u->__uc = '\0';
- break;
- case 8:
- __u->__ui = __src0_4;
-- __u = __extension__ ((void *) __u + 4);
-+ __u = __extension__ (void *)((char *) __u + 4);
- __u->__ui = __src4_4;
- break;
- }
+++ /dev/null
-2001-11-29 Jakub Jelinek <jakub@redhat.com>
-
- * sysdeps/generic/glob.c (next_brace_sub): Return NULL if braces
- don't match, fix {{a,b},c} globbing, clean up.
- Patch by Flavio Veloso <flaviovs@magnux.com>.
- * posix/globtest.sh: Add new tests.
-
-
---- libc/posix/globtest.sh.jj Thu Aug 23 18:48:53 2001
-+++ libc/posix/globtest.sh Thu Nov 29 13:32:05 2001
-@@ -146,6 +146,32 @@ if test $failed -ne 0; then
- result=1
- fi
-
-+failed=0
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
-+${common_objpfx}posix/globtest -b "$testdir" "{file{1,2},-file3}" |
-+sort > $testout
-+cat <<"EOF" | cmp - $testout >> $logfile || failed=1
-+`-file3'
-+`file1'
-+`file2'
-+EOF
-+if test $failed -ne 0; then
-+ echo "Braces test 2 failed" >> $logfile
-+ result=1
-+fi
-+
-+failed=0
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
-+${common_objpfx}posix/globtest -b "$testdir" "{" |
-+sort > $testout
-+cat <<"EOF" | cmp - $testout >> $logfile || failed=1
-+GLOB_NOMATCH
-+EOF
-+if test $failed -ne 0; then
-+ echo "Braces test 3 failed" >> $logfile
-+ result=1
-+fi
-+
- # Test NOCHECK
- failed=0
- ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
-
-
---- libc/sysdeps/generic/glob.c.jj Thu Aug 23 18:49:29 2001
-+++ libc/sysdeps/generic/glob.c Thu Nov 29 13:17:21 2001
-@@ -355,42 +355,14 @@ static
- inline
- #endif
- const char *
--next_brace_sub (begin)
-- const char *begin;
-+next_brace_sub (cp)
-+ const char *cp;
- {
- unsigned int depth = 0;
-- const char *cp = begin;
--
-- while (1)
-- {
-- if (depth == 0)
-- {
-- if (*cp != ',' && *cp != '}' && *cp != '\0')
-- {
-- if (*cp == '{')
-- ++depth;
-- ++cp;
-- continue;
-- }
-- }
-- else
-- {
-- while (*cp != '\0' && (*cp != '}' || depth > 0))
-- {
-- if (*cp == '}')
-- --depth;
-- ++cp;
-- }
-- if (*cp == '\0')
-- /* An incorrectly terminated brace expression. */
-- return NULL;
--
-- continue;
-- }
-- break;
-- }
--
-- return cp;
-+ while (*cp != '\0' && (*cp != '}' || depth--) && (*cp != ',' || depth))
-+ if (*cp++ == '{')
-+ depth++;
-+ return *cp != '\0' ? cp : NULL;
- }
-
- #endif /* !GLOB_ONLY_P */
-
+++ /dev/null
---- libc/sysdeps/i386/Makefile.jj Fri Sep 17 18:59:13 1999
-+++ libc/sysdeps/i386/Makefile Thu Feb 28 19:04:03 2002
-@@ -9,6 +9,12 @@ ifeq ($(subdir),csu)
- # On i686 we must avoid generating the trampoline functions generated
- # to get the GOT pointer.
- CFLAGS-initfini.s += -march=i386 -mcpu=i386
-+
-+ifeq (yes,$(build-shared))
-+# Compatibility
-+sysdep_routines += divdi3
-+shared-only-routines += divdi3
-+endif
- endif
-
- ifeq ($(subdir),db2)
---- libc/sysdeps/m68k/Makefile.jj Thu Aug 23 18:49:59 2001
-+++ libc/sysdeps/m68k/Makefile Thu Feb 28 19:04:29 2002
-@@ -33,6 +33,14 @@ CFLAGS-setjmp.c := -fno-omit-frame-point
- # The 68k `long double' is a distinct type we support.
- long-double-fcts = yes
-
-+ifeq ($(subdir),csu)
-+ifeq (yes,$(build-shared))
-+# Compatibility
-+sysdep_routines += divdi3
-+shared-only-routines += divdi3
-+endif
-+endif
-+
- ifeq ($(subdir),elf)
- CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused
- endif
---- libc/sysdeps/s390/s390-32/Makefile.jj Fri Mar 16 09:59:44 2001
-+++ libc/sysdeps/s390/s390-32/Makefile Thu Feb 28 19:04:44 2002
-@@ -1,5 +1,13 @@
- pic-ccflag = -fpic
-
-+ifeq ($(subdir),csu)
-+ifeq (yes,$(build-shared))
-+# Compatibility
-+sysdep_routines += divdi3
-+shared-only-routines += divdi3
-+endif
-+endif
-+
- ifeq ($(subdir),gmon)
- sysdep_routines += s390-mcount
- endif
---- libc/sysdeps/wordsize-32/divdi3.c.jj Thu Feb 28 18:53:16 2002
-+++ libc/sysdeps/wordsize-32/divdi3.c Thu Feb 28 19:02:18 2002
-@@ -0,0 +1,327 @@
-+/* 64-bit multiplication and division
-+ Copyright (C) 1989, 1992-1999, 2000, 2001, 2002
-+ 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
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <endian.h>
-+#include <stdlib.h>
-+#include <bits/wordsize.h>
-+
-+#if __WORDSIZE != 32
-+#error This is for 32-bit targets only
-+#endif
-+
-+typedef unsigned int UQItype __attribute__ ((mode (QI)));
-+typedef int SItype __attribute__ ((mode (SI)));
-+typedef unsigned int USItype __attribute__ ((mode (SI)));
-+typedef int DItype __attribute__ ((mode (DI)));
-+typedef unsigned int UDItype __attribute__ ((mode (DI)));
-+#define Wtype SItype
-+#define HWtype SItype
-+#define DWtype DItype
-+#define UWtype USItype
-+#define UHWtype USItype
-+#define UDWtype UDItype
-+#define W_TYPE_SIZE 32
-+
-+#include <stdlib/longlong.h>
-+
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+struct DWstruct { Wtype high, low;};
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
-+struct DWstruct { Wtype low, high;};
-+#else
-+#error Unhandled endianity
-+#endif
-+typedef union { struct DWstruct s; DWtype ll; } DWunion;
-+
-+static UDWtype
-+__udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp)
-+{
-+ DWunion ww;
-+ DWunion nn, dd;
-+ DWunion rr;
-+ UWtype d0, d1, n0, n1, n2;
-+ UWtype q0, q1;
-+ UWtype b, bm;
-+
-+ nn.ll = n;
-+ dd.ll = d;
-+
-+ d0 = dd.s.low;
-+ d1 = dd.s.high;
-+ n0 = nn.s.low;
-+ n1 = nn.s.high;
-+
-+#if !UDIV_NEEDS_NORMALIZATION
-+ if (d1 == 0)
-+ {
-+ if (d0 > n1)
-+ {
-+ /* 0q = nn / 0D */
-+
-+ udiv_qrnnd (q0, n0, n1, n0, d0);
-+ q1 = 0;
-+
-+ /* Remainder in n0. */
-+ }
-+ else
-+ {
-+ /* qq = NN / 0d */
-+
-+ if (d0 == 0)
-+ d0 = 1 / d0; /* Divide intentionally by zero. */
-+
-+ udiv_qrnnd (q1, n1, 0, n1, d0);
-+ udiv_qrnnd (q0, n0, n1, n0, d0);
-+
-+ /* Remainder in n0. */
-+ }
-+
-+ if (rp != 0)
-+ {
-+ rr.s.low = n0;
-+ rr.s.high = 0;
-+ *rp = rr.ll;
-+ }
-+ }
-+
-+#else /* UDIV_NEEDS_NORMALIZATION */
-+
-+ if (d1 == 0)
-+ {
-+ if (d0 > n1)
-+ {
-+ /* 0q = nn / 0D */
-+
-+ count_leading_zeros (bm, d0);
-+
-+ if (bm != 0)
-+ {
-+ /* Normalize, i.e. make the most significant bit of the
-+ denominator set. */
-+
-+ d0 = d0 << bm;
-+ n1 = (n1 << bm) | (n0 >> (W_TYPE_SIZE - bm));
-+ n0 = n0 << bm;
-+ }
-+
-+ udiv_qrnnd (q0, n0, n1, n0, d0);
-+ q1 = 0;
-+
-+ /* Remainder in n0 >> bm. */
-+ }
-+ else
-+ {
-+ /* qq = NN / 0d */
-+
-+ if (d0 == 0)
-+ d0 = 1 / d0; /* Divide intentionally by zero. */
-+
-+ count_leading_zeros (bm, d0);
-+
-+ if (bm == 0)
-+ {
-+ /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-+ conclude (the most significant bit of n1 is set) /\ (the
-+ leading quotient digit q1 = 1).
-+
-+ This special case is necessary, not an optimization.
-+ (Shifts counts of W_TYPE_SIZE are undefined.) */
-+
-+ n1 -= d0;
-+ q1 = 1;
-+ }
-+ else
-+ {
-+ /* Normalize. */
-+
-+ b = W_TYPE_SIZE - bm;
-+
-+ d0 = d0 << bm;
-+ n2 = n1 >> b;
-+ n1 = (n1 << bm) | (n0 >> b);
-+ n0 = n0 << bm;
-+
-+ udiv_qrnnd (q1, n1, n2, n1, d0);
-+ }
-+
-+ /* n1 != d0... */
-+
-+ udiv_qrnnd (q0, n0, n1, n0, d0);
-+
-+ /* Remainder in n0 >> bm. */
-+ }
-+
-+ if (rp != 0)
-+ {
-+ rr.s.low = n0 >> bm;
-+ rr.s.high = 0;
-+ *rp = rr.ll;
-+ }
-+ }
-+#endif /* UDIV_NEEDS_NORMALIZATION */
-+
-+ else
-+ {
-+ if (d1 > n1)
-+ {
-+ /* 00 = nn / DD */
-+
-+ q0 = 0;
-+ q1 = 0;
-+
-+ /* Remainder in n1n0. */
-+ if (rp != 0)
-+ {
-+ rr.s.low = n0;
-+ rr.s.high = n1;
-+ *rp = rr.ll;
-+ }
-+ }
-+ else
-+ {
-+ /* 0q = NN / dd */
-+
-+ count_leading_zeros (bm, d1);
-+ if (bm == 0)
-+ {
-+ /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-+ conclude (the most significant bit of n1 is set) /\ (the
-+ quotient digit q0 = 0 or 1).
-+
-+ This special case is necessary, not an optimization. */
-+
-+ /* The condition on the next line takes advantage of that
-+ n1 >= d1 (true due to program flow). */
-+ if (n1 > d1 || n0 >= d0)
-+ {
-+ q0 = 1;
-+ sub_ddmmss (n1, n0, n1, n0, d1, d0);
-+ }
-+ else
-+ q0 = 0;
-+
-+ q1 = 0;
-+
-+ if (rp != 0)
-+ {
-+ rr.s.low = n0;
-+ rr.s.high = n1;
-+ *rp = rr.ll;
-+ }
-+ }
-+ else
-+ {
-+ UWtype m1, m0;
-+ /* Normalize. */
-+
-+ b = W_TYPE_SIZE - bm;
-+
-+ d1 = (d1 << bm) | (d0 >> b);
-+ d0 = d0 << bm;
-+ n2 = n1 >> b;
-+ n1 = (n1 << bm) | (n0 >> b);
-+ n0 = n0 << bm;
-+
-+ udiv_qrnnd (q0, n1, n2, n1, d1);
-+ umul_ppmm (m1, m0, q0, d0);
-+
-+ if (m1 > n1 || (m1 == n1 && m0 > n0))
-+ {
-+ q0--;
-+ sub_ddmmss (m1, m0, m1, m0, d1, d0);
-+ }
-+
-+ q1 = 0;
-+
-+ /* Remainder in (n1n0 - m1m0) >> bm. */
-+ if (rp != 0)
-+ {
-+ sub_ddmmss (n1, n0, n1, n0, m1, m0);
-+ rr.s.low = (n1 << b) | (n0 >> bm);
-+ rr.s.high = n1 >> bm;
-+ *rp = rr.ll;
-+ }
-+ }
-+ }
-+ }
-+
-+ ww.s.low = q0;
-+ ww.s.high = q1;
-+ return ww.ll;
-+}
-+
-+DWtype
-+__divdi3 (DWtype u, DWtype v)
-+{
-+ Wtype c = 0;
-+ DWtype w;
-+
-+ if (u < 0)
-+ {
-+ c = ~c;
-+ u = -u;
-+ }
-+ if (v < 0)
-+ {
-+ c = ~c;
-+ v = -v;
-+ }
-+ w = __udivmoddi4 (u, v, NULL);
-+ if (c)
-+ w = -w;
-+ return w;
-+}
-+
-+DWtype
-+__moddi3 (DWtype u, DWtype v)
-+{
-+ Wtype c = 0;
-+ DWtype w;
-+
-+ if (u < 0)
-+ {
-+ c = ~c;
-+ u = -u;
-+ }
-+ if (v < 0)
-+ {
-+ c = ~c;
-+ v = -v;
-+ }
-+ __udivmoddi4 (u, v, &w);
-+ if (c)
-+ w = -w;
-+ return w;
-+}
-+
-+UDWtype
-+__udivdi3 (UDWtype u, UDWtype v)
-+{
-+ return __udivmoddi4 (u, v, NULL);
-+}
-+
-+UDWtype
-+__umoddi3 (UDWtype u, UDWtype v)
-+{
-+ UDWtype w;
-+
-+ __udivmoddi4 (u, v, &w);
-+ return w;
-+}
+++ /dev/null
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r4.ebuild,v 1.10 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="nls pic build"
-inherit flag-o-matic
-
-filter-flags "-fomit-frame-pointer -malign-double"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
- ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-KEYWORDS="x86 ppc"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-
-#portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-#drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND="sys-kernel/linux-headers nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
-if [ -z "`use build`" ]
-then
- RDEPEND="$RDEPEND sys-apps/baselayout"
-else
- RDEPEND="$RDEPEND >=sys-apps/portage-1.8.9_pre1 sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
- unpack glibc-${PV}.tar.bz2 || die
- cd ${S}
- #extract pre-made man pages. Otherwise we need perl, which is a no-no.
- mkdir man; cd man
- tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
- cd ${S}
- unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-
- # This patch apparently eliminates compiler warnings for some versions of gcc.
- # For information about the string2 patch, see:
- # http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
- patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
- # This next one is a new patch to fix thread signal handling. See:
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
- # (Added by drobbins on 05 Mar 2002)
- patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
-
- # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
- cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
- # The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
- # shouldn't be necessary. The solution is to add -O2. According to Andreas Jaeger of SuSE, "glibc
- # *needs* to be compiled with optimization" (emphasis mine). So let's fix the optimization settings,
- # not tweak glibc.
- # (drobbins, 10 Feb 2002)
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
- # cd ${S}/linuxthreads
- # cp spinlock.c spinlock.c.orig
- # sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-
- # The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
- # http://lwn.net/2001/1220/a/glibc-vulnerability.php3
- # cd ${S}
- # patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-
- if [ ${ARCH} == "x86" ]; then
- # This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
- cd ${S}
- patch -p1 < ${FILESDIR}/glibc-divdi3.diff || die
- fi
-
-}
-
-src_compile() {
- local myconf
- # If we build for the build system we use the kernel headers from the target
- [ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
- [ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
- rm -rf buildhere
- mkdir buildhere
- cd buildhere
- ../configure --host=${CHOST} --with-gd=no --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
- --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-
- #This next option breaks the Sun JDK and the IBM JDK
- #We should really keep compatibility with older kernels, anyway
- #--enable-kernel=2.4.0
- make PARALLELMFLAGS="${MAKEOPTS}" || die
- make check
-}
-
-
-src_install() {
- export LC_ALL=C
- make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
- if [ -z "`use build`" ]
- then
- make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
- make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
- #install linuxthreads man pages
- dodir /usr/share/man/man3
- doman ${S}/man/*.3thr
- install -m 644 nscd/nscd.conf ${D}/etc
- dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
- else
- rm -rf ${D}/usr/share ${D}/usr/lib/gconv
- fi
- if [ "`use pic`" ]
- then
- find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
- find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
- for i in ${D}/lib/*.map
- do
- mv ${i} ${i%.map}_pic.map
- done
- fi
- #is this next line actually needed or does the makefile get it right?
- #It previously has 0755 perms which was killing things.
- chmod 4755 ${D}/usr/lib/misc/pt_chown
- rm -f ${D}/etc/ld.so.cache
-
- #prevent overwriting of the /etc/localtime symlink. We'll handle the
- #creation of the "factory" symlink in pkg_postinst().
- rm -f ${D}/etc/localtime
-
- #some things want this, notably ash.
- dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-pkg_postinst()
-{
- # Correct me if I am wrong here, but my /etc/localtime is a file
- # created by zic ....
- # I am thinking that it should only be recreated if no /etc/localtime
- # exists, or if it is an invalid symlink.
- #
- # For invalid symlink:
- # -f && -e will fail
- # -L will succeed
- #
- if [ ! -e ${ROOT}/etc/localtime ]
- then
- echo "Please remember to set your timezone using the zic command."
- rm -f ${ROOT}/etc/localtime
- ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
- fi
-}
+++ /dev/null
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r5.ebuild,v 1.9 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="nls pic build"
-inherit flag-o-matic
-
-filter-flags "-fomit-frame-pointer -malign-double"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
- ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-KEYWORDS="x86 ppc sparc sparc64"
-LICENSE="GPL-2"
-SLOT="2.2"
-
-#portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-#drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND="sys-kernel/linux-headers
- nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
-if [ -z "`use build`" ]
-then
- RDEPEND="${RDEPEND}
- sys-apps/baselayout"
-else
- RDEPEND="${RDEPEND}
- >=sys-apps/portage-1.8.9_pre1
- sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
- unpack glibc-${PV}.tar.bz2 || die
- cd ${S}
- #extract pre-made man pages. Otherwise we need perl, which is a no-no.
- mkdir man; cd man
- tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
- cd ${S}
- unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-
- # This patch apparently eliminates compiler warnings for some versions of gcc.
- # For information about the string2 patch, see:
- # http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
- patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
- # This next one is a new patch to fix thread signal handling. See:
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
- # (Added by drobbins on 05 Mar 2002)
- patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
-
- # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
- cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
- # The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
- # shouldn't be necessary. The solution is to add -O2. According to Andreas Jaeger of SuSE, "glibc
- # *needs* to be compiled with optimization" (emphasis mine). So let's fix the optimization settings,
- # not tweak glibc.
- # (drobbins, 10 Feb 2002)
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
- # cd ${S}/linuxthreads
- # cp spinlock.c spinlock.c.orig
- # sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-
- # The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
- # http://lwn.net/2001/1220/a/glibc-vulnerability.php3
- # cd ${S}
- # patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-
- # A buffer overflow vulnerability exists in multiple implementations of DNS
- # resolver libraries. This affects glibc-2.2.5 and earlier. See bug #4923
- # and:
- #
- # http://www.cert.org/advisories/CA-2002-19.html
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-dns-network-overflow.diff || die
-
- if [ ${ARCH} == "x86" ]; then
- # This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
- cd ${S}
- patch -p1 < ${FILESDIR}/glibc-divdi3.diff || die
- fi
-
- # Some gcc-3.1.1 fixes. This works fine for other versions of gcc as well,
- # and should generally be ok, as it just fixes define order that causes scope
- # problems with gcc-3.1.1.
- # (Azarah, 14 Jul 2002)
- patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311.patch || die
-
- # Avoid "Error: illegal instruction" when compiling on sparc with gcc 3.1.1
- if [ ${ARCH} == "sparc" -o ${ARCH} == "sparc64" ]; then
- patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311-sparc.patch || die
- fi
-
-}
-
-src_compile() {
- local myconf=""
- # If we build for the build system we use the kernel headers from the target
- use build && myconf="${myconf} --with-header=${ROOT}usr/include"
- use nls || myconf="${myconf} --disable-nls"
-
- rm -rf buildhere
- mkdir buildhere
- cd buildhere
- ../configure --host=${CHOST} \
- --with-gd=no \
- --without-cvs \
- --enable-add-ons=linuxthreads \
- --disable-profile \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --libexecdir=/usr/lib/misc \
- ${myconf} || die
- #This next option breaks the Sun JDK and the IBM JDK
- #We should really keep compatibility with older kernels, anyway
- #--enable-kernel=2.4.0
-
- make PARALLELMFLAGS="${MAKEOPTS}" || die
- make check
-}
-
-
-src_install() {
- export LC_ALL=C
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- install -C buildhere || die
-
- if [ -z "`use build`" ]
- then
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- info -C buildhere || die
-
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- localedata/install-locales -C buildhere || die
-
- #install linuxthreads man pages
- dodir /usr/share/man/man3
- doman ${S}/man/*.3thr
- install -m 644 nscd/nscd.conf ${D}/etc
- dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
- NEWS NOTES PROJECTS README*
- else
- rm -rf ${D}/usr/share ${D}/usr/lib/gconv
- fi
-
- if [ "`use pic`" ]
- then
- find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
- find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
- for i in ${D}/lib/*.map
- do
- mv ${i} ${i%.map}_pic.map
- done
- fi
-
- #is this next line actually needed or does the makefile get it right?
- #It previously has 0755 perms which was killing things.
- chmod 4755 ${D}/usr/lib/misc/pt_chown
- rm -f ${D}/etc/ld.so.cache
-
- #prevent overwriting of the /etc/localtime symlink. We'll handle the
- #creation of the "factory" symlink in pkg_postinst().
- rm -f ${D}/etc/localtime
-
- #some things want this, notably ash.
- dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-pkg_postinst() {
- # Correct me if I am wrong here, but my /etc/localtime is a file
- # created by zic ....
- # I am thinking that it should only be recreated if no /etc/localtime
- # exists, or if it is an invalid symlink.
- #
- # For invalid symlink:
- # -f && -e will fail
- # -L will succeed
- #
- if [ ! -e ${ROOT}/etc/localtime ]
- then
- echo "Please remember to set your timezone using the zic command."
- rm -f ${ROOT}/etc/localtime
- ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
- fi
-}
-
+++ /dev/null
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r6.ebuild,v 1.8 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="nls pic build"
-inherit flag-o-matic
-
-filter-flags "-fomit-frame-pointer -malign-double"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
- ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-LICENSE="GPL-2"
-SLOT="2.2"
-
-#portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-#drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND="sys-kernel/linux-headers
- nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
-if [ -z "`use build`" ]
-then
- RDEPEND="${RDEPEND}
- sys-apps/baselayout"
-else
- RDEPEND="${RDEPEND}
- >=sys-apps/portage-1.8.9_pre1
- sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
- unpack glibc-${PV}.tar.bz2 || die
- cd ${S}
- #extract pre-made man pages. Otherwise we need perl, which is a no-no.
- mkdir man; cd man
- tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
- cd ${S}
- unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-
- # This patch apparently eliminates compiler warnings for some versions of gcc.
- # For information about the string2 patch, see:
- # http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
- patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
- # This next one is a new patch to fix thread signal handling. See:
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
- # (Added by drobbins on 05 Mar 2002)
- patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
-
- # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
- cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
- # The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
- # shouldn't be necessary. The solution is to add -O2. According to Andreas Jaeger of SuSE, "glibc
- # *needs* to be compiled with optimization" (emphasis mine). So let's fix the optimization settings,
- # not tweak glibc.
- # (drobbins, 10 Feb 2002)
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
- # cd ${S}/linuxthreads
- # cp spinlock.c spinlock.c.orig
- # sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-
- # The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
- # http://lwn.net/2001/1220/a/glibc-vulnerability.php3
- # cd ${S}
- # patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-
- # A buffer overflow vulnerability exists in multiple implementations of DNS
- # resolver libraries. This affects glibc-2.2.5 and earlier. See bug #4923
- # and:
- #
- # http://www.cert.org/advisories/CA-2002-19.html
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-dns-network-overflow.diff || die
-
- # Security update for sunrpc
- # <aliz@gentoo.org>
- #
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-sunrpc-overflow.diff || die
-
- if [ "${ARCH}" = "x86" ]; then
- # This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
- # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
- cd ${S}; patch -p1 < ${FILESDIR}/glibc-divdi3.diff || die
- fi
-
- # Some gcc-3.1.1 fixes. This works fine for other versions of gcc as well,
- # and should generally be ok, as it just fixes define order that causes scope
- # problems with gcc-3.1.1.
- # (Azarah, 14 Jul 2002)
- cd ${S}; patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311.patch || die
-
- # Avoid "Error: illegal instruction" when compiling on sparc with gcc 3.1.1
- if [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]; then
- cd ${S}; patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311-sparc.patch || die
- fi
-
- # Some patches to fixup build on alpha
- if [ "${ARCH}" = "alpha" ]; then
- cd ${S}
- patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-gcc3-fix.diff || die
- patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-pcdyn-fix.diff || die
- fi
-}
-
-src_compile() {
- local myconf=""
- # If we build for the build system we use the kernel headers from the target
- use build && myconf="${myconf} --with-header=${ROOT}usr/include"
- use nls || myconf="${myconf} --disable-nls"
-
- rm -rf buildhere
- mkdir buildhere
- cd buildhere
- ../configure --host=${CHOST} \
- --with-gd=no \
- --without-cvs \
- --enable-add-ons=linuxthreads \
- --disable-profile \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --libexecdir=/usr/lib/misc \
- ${myconf} || die
- #This next option breaks the Sun JDK and the IBM JDK
- #We should really keep compatibility with older kernels, anyway
- #--enable-kernel=2.4.0
-
- make PARALLELMFLAGS="${MAKEOPTS}" || die
- make check
-}
-
-
-src_install() {
- export LC_ALL=C
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- install -C buildhere || die
-
- if [ -z "`use build`" ]
- then
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- info -C buildhere || die
-
- make PARALLELMFLAGS="${MAKEOPTS}" \
- install_root=${D} \
- localedata/install-locales -C buildhere || die
-
- #install linuxthreads man pages
- dodir /usr/share/man/man3
- doman ${S}/man/*.3thr
- install -m 644 nscd/nscd.conf ${D}/etc
- dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
- NEWS NOTES PROJECTS README*
- else
- rm -rf ${D}/usr/share ${D}/usr/lib/gconv
- fi
-
- if [ "`use pic`" ]
- then
- find ${S}/buildhere -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
- find ${S}/buildhere -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
- find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
- find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
- for i in ${D}/lib/*.map
- do
- mv ${i} ${i%.map}_pic.map
- done
- fi
-
- #is this next line actually needed or does the makefile get it right?
- #It previously has 0755 perms which was killing things.
- chmod 4755 ${D}/usr/lib/misc/pt_chown
- rm -f ${D}/etc/ld.so.cache
-
- #prevent overwriting of the /etc/localtime symlink. We'll handle the
- #creation of the "factory" symlink in pkg_postinst().
- rm -f ${D}/etc/localtime
-
- #some things want this, notably ash.
- dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-pkg_postinst() {
- # Correct me if I am wrong here, but my /etc/localtime is a file
- # created by zic ....
- # I am thinking that it should only be recreated if no /etc/localtime
- # exists, or if it is an invalid symlink.
- #
- # For invalid symlink:
- # -f && -e will fail
- # -L will succeed
- #
- if [ ! -e ${ROOT}/etc/localtime ]
- then
- echo "Please remember to set your timezone using the zic command."
- rm -f ${ROOT}/etc/localtime
- ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
- fi
-}
-
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r7.ebuild,v 1.14 2002/10/13 12:44:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r7.ebuild,v 1.15 2002/10/13 21:15:56 azarah Exp $
IUSE="nls pic build"
-inherit flag-o-matic
+inherit flag-o-matic gcc
filter-flags "-fomit-frame-pointer -malign-double"
#portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
#drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND="sys-kernel/linux-headers
- nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
DEPEND="sys-kernel/linux-headers
nls? ( sys-devel/gettext )"
RDEPEND="sys-kernel/linux-headers
cd ${S}
#extract pre-made man pages. Otherwise we need perl, which is a no-no.
mkdir man; cd man
- tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
+ tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 > /dev/null || die
cd ${S}
unpack glibc-linuxthreads-${PV}.tar.bz2 || die
# This patch apparently eliminates compiler warnings for some versions of gcc.
# For information about the string2 patch, see:
# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
- patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
+ einfo "Applying string2.h patch..."
+ cd ${S}; patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff > /dev/null || die
# This next one is a new patch to fix thread signal handling. See:
# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
# (Added by drobbins on 05 Mar 2002)
- patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
+ einfo "Applying threadsig patch..."
+ patch -p0 < ${FILESDIR}/${PV}/${P}-threadsig.diff > /dev/null || die
# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
- cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
- # The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
- # shouldn't be necessary. The solution is to add -O2. According to Andreas Jaeger of SuSE, "glibc
- # *needs* to be compiled with optimization" (emphasis mine). So let's fix the optimization settings,
- # not tweak glibc.
- # (drobbins, 10 Feb 2002)
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
- # http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
- # cd ${S}/linuxthreads
- # cp spinlock.c spinlock.c.orig
- # sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-
- # The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
- # http://lwn.net/2001/1220/a/glibc-vulnerability.php3
- # cd ${S}
- # patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
+ einfo "Applying test-lfs-timeout patch..."
+ cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch > /dev/null || die
# A buffer overflow vulnerability exists in multiple implementations of DNS
# resolver libraries. This affects glibc-2.2.5 and earlier. See bug #4923
# and:
#
# http://www.cert.org/advisories/CA-2002-19.html
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-dns-network-overflow.diff || die
+ einfo "Applying dns-network-overflow patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-dns-network-overflow.diff > /dev/null || die
# Security update for sunrpc
# <aliz@gentoo.org>
- #
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-sunrpc-overflow.diff || die
+ einfo "Applying sunrpc-overflow patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sunrpc-overflow.diff > /dev/null || die
if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" ]; then
# This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
- cd ${S}; patch -p1 < ${FILESDIR}/${P}-divdi3.diff || die
+ einfo "Applying divdi3 patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-divdi3.diff > /dev/null || die
fi
# Some gcc-3.1.1 fixes. This works fine for other versions of gcc as well,
# and should generally be ok, as it just fixes define order that causes scope
# problems with gcc-3.1.1.
# (Azarah, 14 Jul 2002)
- cd ${S}; patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311.patch || die
+ einfo "Applying gcc311 patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-gcc311.patch > /dev/null || die
+
+ if [ "`gcc-version`" = "3.2" ]; then
+ cd ${S}
+ einfo "Applying divbyzero patch..."
+ patch -p1 < ${FILESDIR}/${PV}/${P}.divbyzero.patch > /dev/null || die
+ einfo "Applying restrict_arr patch..."
+ patch -p1 < ${FILESDIR}/${PV}/${P}.restrict_arr.patch > /dev/null || die
+ fi
# Some patches to fixup build on alpha
if [ "${ARCH}" = "alpha" ]; then
cd ${S}
- patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-gcc3-fix.diff || die
- patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-pcdyn-fix.diff || die
+ einfo "Applying alpha-gcc3-fix patch..."
+ patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-gcc3-fix.diff > /dev/null || die
+ einfo "Applying alpha-pcdyn-fix patch..."
+ patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-pcdyn-fix.diff > /dev/null || die
fi
# Some patches to fixup build on sparc and sparc64
- if use sparc64 || use sparc
+ if use sparc64 > /dev/null || use sparc > /dev/null
then
- einfo "sparc patch"
- cd ${S}
- patch -p1 < ${FILESDIR}/${P}-sparc-misc.diff || die
+ einfo "Applying sparc-misc patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc-misc.diff > /dev/null || die
fi
- if use sparc64
+ if use sparc64 > /dev/null
then
- einfo "seemant sparc64 patch"
- cd ${S}
- patch -p1 < ${FILESDIR}/${P}-sparc64-fixups.diff || die
+ einfo "Applying seemant's sparc64-fixups patch..."
+ cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc64-fixups.diff > /dev/null || die
fi
}
use nls || myconf="${myconf} --disable-nls"
+ einfo "Configuring GLIBC..."
rm -rf buildhere
mkdir buildhere
cd buildhere
#We should really keep compatibility with older kernels, anyway
#--enable-kernel=2.4.0
+ einfo "Building GLIBC..."
make PARALLELMFLAGS="${MAKEOPTS}" || die
+ einfo "Doing GLIBC checks..."
make check
}
src_install() {
- export LC_ALL=C
+ export LC_ALL="C"
+ einfo "Installing GLIBC..."
make PARALLELMFLAGS="${MAKEOPTS}" \
install_root=${D} \
install -C buildhere || die
if [ -z "`use build`" ]
then
+ einfo "Installing Info pages..."
make PARALLELMFLAGS="${MAKEOPTS}" \
install_root=${D} \
info -C buildhere || die
-
+
+ einfo "Installing Locale data..."
make PARALLELMFLAGS="${MAKEOPTS}" \
install_root=${D} \
localedata/install-locales -C buildhere || die
-
+
+ einfo "Installing man pages and docs..."
#install linuxthreads man pages
dodir /usr/share/man/man3
- doman ${S}/man/*.3thr
+ doman ${S}/man/*.3thr
+
install -m 644 nscd/nscd.conf ${D}/etc
dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
NEWS NOTES PROJECTS README*
projects / gentoo.git / commitdiff