patches/gcc/4.3.2/200-pr24170.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:26:53 2011 +0200 (2011-08-02)
changeset 2592 4908eb2b6f17
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts/functions: cvs retrieval first tries the mirror for tarballs

The cvs download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via cvs.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard cvs retrieval will kick in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
yann@552
     2
http://gcc.gnu.org/PR24170
yann@552
     3
yann@552
     4
2008-02-20  Tom Tromey  <tromey@redhat.com>
yann@552
     5
yann@552
     6
	PR libgcj/24170:
yann@552
     7
	* java/io/natFilePosix.cc (File::performList): Don't use
yann@552
     8
	readdir_r.
yann@552
     9
	* configure, include/config.h.in: Rebuilt.
yann@552
    10
	* configure.ac: Don't check for readdir_r.
yann@552
    11
yann@552
    12
diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
yann@552
    13
--- gcc-4.3.1.orig/libjava/configure.ac	2008-06-10 14:57:42.000000000 +0200
yann@552
    14
+++ gcc-4.3.1/libjava/configure.ac	2008-06-10 14:58:13.000000000 +0200
yann@552
    15
@@ -1030,7 +1030,7 @@
yann@552
    16
    PLATFORMNET=NoNet
yann@552
    17
 else
yann@552
    18
    AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
yann@552
    19
-                   localtime_r readdir_r getpwuid_r getcwd \
yann@552
    20
+                   localtime_r getpwuid_r getcwd \
yann@552
    21
 		   access stat lstat mkdir rename rmdir unlink utime chmod readlink \
yann@552
    22
 		   nl_langinfo setlocale \
yann@552
    23
 		   inet_pton uname inet_ntoa \
yann@552
    24
diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in
yann@552
    25
--- gcc-4.3.1.orig/libjava/include/config.h.in	2007-07-31 18:17:21.000000000 +0200
yann@552
    26
+++ gcc-4.3.1/libjava/include/config.h.in	2008-06-10 14:58:13.000000000 +0200
yann@552
    27
@@ -214,9 +214,6 @@
yann@552
    28
 /* Define to 1 if you have the <pwd.h> header file. */
yann@552
    29
 #undef HAVE_PWD_H
yann@552
    30
 
yann@552
    31
-/* Define to 1 if you have the `readdir_r' function. */
yann@552
    32
-#undef HAVE_READDIR_R
yann@552
    33
-
yann@552
    34
 /* Define to 1 if you have the `readlink' function. */
yann@552
    35
 #undef HAVE_READLINK
yann@552
    36
 
yann@552
    37
diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc
yann@552
    38
--- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc	2007-08-04 23:50:01.000000000 +0200
yann@552
    39
+++ gcc-4.3.1/libjava/java/io/natFilePosix.cc	2008-06-10 14:58:13.000000000 +0200
yann@552
    40
@@ -1,6 +1,6 @@
yann@552
    41
 // natFile.cc - Native part of File class for POSIX.
yann@552
    42
 
yann@552
    43
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
yann@552
    44
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
yann@552
    45
    Free Software Foundation
yann@552
    46
 
yann@552
    47
    This file is part of libgcj.
yann@552
    48
@@ -292,13 +292,7 @@
yann@552
    49
 
yann@552
    50
   java::util::ArrayList *list = new java::util::ArrayList ();
yann@552
    51
   struct dirent *d;
yann@552
    52
-#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
yann@552
    53
-  int name_max = pathconf (buf, _PC_NAME_MAX);
yann@552
    54
-  char dbuf[sizeof (struct dirent) + name_max + 1];
yann@552
    55
-  while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
yann@552
    56
-#else /* HAVE_READDIR_R */
yann@552
    57
   while ((d = readdir (dir)) != NULL)
yann@552
    58
-#endif /* HAVE_READDIR_R */
yann@552
    59
     {
yann@552
    60
       // Omit "." and "..".
yann@552
    61
       if (d->d_name[0] == '.'