2003/09/07 11:15:59

darcs-hash:20040130070530-2ba56-479981b66b0f10125b42a9ce4d53e5fdd1a92005.gz

diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch
index e4940a8..0a3e651 100644 (file)
--- a/upstream/darwin-linker/patches/cctools.patch
+++ b/upstream/darwin-linker/patches/cctools.patch
@@ -2290,7 +2290,7 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
  ifeq "NO" "$(USE_DEPENDENCY_FILE)"
  .c.o:
 --- ar/archive.c       30 Apr 2002 07:37:17 -0000      1.1.1.1
-+++ ar/archive.c       7 Sep 2003 10:12:52 -0000
++++ ar/archive.c       7 Sep 2003 10:15:36 -0000
 @@ -69,6 +69,7 @@
  
  #include <sys/param.h>
@@ -2299,16 +2299,11 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
  
  #include <ar.h>
  #include <dirent.h>
-@@ -261,32 +262,25 @@
+@@ -261,32 +262,17 @@
                 * a space, use extended format 1.
                 */
                lname = strlen(name);
 -              if (options & AR_TR) {
-+                      printf("nameX: %s\n", name);
-+                      fflush(stdout);
-+
-+                      printf("name: %s\n", name);
-+                      fflush(stdout);
                        if (lname > OLDARMAXNAME) {
                                (void)fflush(stdout);
                                warnx("warning: %s truncated to %.*s",
@@ -2335,9 +2330,6 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
 -                          (unsigned int)(u_short)sb->st_gid,
 -                          sb->st_mode, sb->st_size, ARFMAG);
 -              }
-+
-+                      printf("done\n");
-+                      fflush(stdout);
                size = sb->st_size;
        } else {
                lname = chdr.lname;