From a06d8a8a36883b31601d9e5711918cb3bfc25ac0 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Wed, 19 May 2010 15:14:31 -0500
Subject: [PATCH] Using nicear to get rid of spurious ar stderr output

---
 src/gracket/gc2/Makefile.in          | 3 ++-
 src/racket/Makefile.in               | 5 +++--
 src/racket/gc/Makefile.in            | 3 ++-
 src/racket/gc2/Makefile.in           | 3 ++-
 src/utils/nicear                     | 4 ++++
 src/wxxt/contrib/xpm/lib/Makefile.in | 5 +++--
 6 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100755 src/utils/nicear

diff --git a/src/gracket/gc2/Makefile.in b/src/gracket/gc2/Makefile.in
index d12e17ece5..6af7ccd74b 100644
--- a/src/gracket/gc2/Makefile.in
+++ b/src/gracket/gc2/Makefile.in
@@ -26,6 +26,7 @@ CXX = @CXX@
 LINKER = $(CXX)
 PERL = @PERL@
 RANLIB = @RANLIB@
+NICEAR = $(PLTSRCDIR)/utils/nicear
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 OPTIONS = @OPTIONS@ @GC2OPTIONS@ @MROPTIONS@
@@ -1238,7 +1239,7 @@ GRACKETMZOBJS_a = $(MZOBJS)
 GRACKETMZOBJS_la =
 
 ../libgracket3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS)
-	$(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@) 
+	$(NICEAR) $(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@) 
 	$(RANLIB) ../libgracket3m.@LIBSFX@
 
 ../gracket@MMM@@NOT_OSX@: grmain.@LTO@ ../libgracket3m.@LIBSFX@
diff --git a/src/racket/Makefile.in b/src/racket/Makefile.in
index 402657a339..c0594f7b5d 100644
--- a/src/racket/Makefile.in
+++ b/src/racket/Makefile.in
@@ -21,6 +21,7 @@ NOOP = :
 CC = @CC@
 CPP = @CPP@
 
+NICEAR = $(mainsrcdir)/utils/nicear
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 RANLIB = @RANLIB@
@@ -108,7 +109,7 @@ sproc-extra-lib:
 	$(MAKE) sproc.@LTO@
 
 gc.@LIBSFX@: 
-	$(AR) $(ARFLAGS) @GCDIR@/gc.@LIBSFX@ @GCDIR@/*.@LTO@
+	$(NICEAR) $(AR) $(ARFLAGS) @GCDIR@/gc.@LIBSFX@ @GCDIR@/*.@LTO@
 
 # Compilation of the foreign libraries (this compiles all of them)
 foreign-stuff:
@@ -127,7 +128,7 @@ FOREIGN_NOT_USED_LIB =
 FOREIGN_NOT_USED_OBJSLIB = 
 
 libracket.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB)
-	$(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRACKET_DEP@
+	$(NICEAR) $(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRACKET_DEP@
 	$(RANLIB) libracket.@LIBSFX@
 
 # Irix sproc, only
diff --git a/src/racket/gc/Makefile.in b/src/racket/gc/Makefile.in
index c44038fee1..5c442c0470 100644
--- a/src/racket/gc/Makefile.in
+++ b/src/racket/gc/Makefile.in
@@ -335,6 +335,7 @@ HOSTCFLAGS=$(BASEFLAGS)
 #
 
 CXXFLAGS= $(CFLAGS) 
+NICEAR = $(mainsrcdir)/utils/nicear
 AR= @AR@
 ARFLAGS= @ARFLAGS@
 RANLIB= @RANLIB@
@@ -498,7 +499,7 @@ tests:
 
 # PLTSCHEME: make ../libmzgc.a, and use $(AR), $(RANLIB), and @LIBSFX@:
 base_lib ../libmzgc.@LIBSFX@: $(@LIBATOM@) $(OBJS) dyn_load.@LTO@ $(UTILS)
-	$(AR) $(ARFLAGS) ../libmzgc.@LIBSFX@ $(OBJS) dyn_load.@LTO@
+	$(NICEAR) $(AR) $(ARFLAGS) ../libmzgc.@LIBSFX@ $(OBJS) dyn_load.@LTO@
 	$(RANLIB) ../libmzgc.@LIBSFX@
 
 cords: $(CORD_OBJS) cord/cordtest $(UTILS)
diff --git a/src/racket/gc2/Makefile.in b/src/racket/gc2/Makefile.in
index 5e5f299119..8a6c49a756 100644
--- a/src/racket/gc2/Makefile.in
+++ b/src/racket/gc2/Makefile.in
@@ -14,6 +14,7 @@ mainsrcdir = @srcdir@/../..
 CC = @CC@
 CPP = @CPP@
 CXX = @CXX@
+NICEAR = $(mainsrcdir)/utils/nicear
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 RANLIB = @RANLIB@
@@ -379,7 +380,7 @@ EXTRA_OBJS_T = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_U
 EXTRA_OBJS_L = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)
 
 ../libracket3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@
-	$(AR) $(ARFLAGS) ../libracket3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@
+	$(NICEAR) $(AR) $(ARFLAGS) ../libracket3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@
 	$(RANLIB) ../libracket3m.@LIBSFX@
 
 ../racket@MMM@@NOT_OSX@: main.@LTO@ ../libracket3m.@LIBSFX@
diff --git a/src/utils/nicear b/src/utils/nicear
new file mode 100755
index 0000000000..fd62028ab8
--- /dev/null
+++ b/src/utils/nicear
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+$* 2>&1 | awk '/^ar: creating / || /^[ar] \-/ { print } ! ( /ar: creating / || /^[ar] \-/ ) { print | "cat 1>&2" }'
+
diff --git a/src/wxxt/contrib/xpm/lib/Makefile.in b/src/wxxt/contrib/xpm/lib/Makefile.in
index a08a40dcdc..0e9987722b 100644
--- a/src/wxxt/contrib/xpm/lib/Makefile.in
+++ b/src/wxxt/contrib/xpm/lib/Makefile.in
@@ -25,7 +25,7 @@
 
 srcdir = @srcdir@
 
-PLTSRCDIR = $(srcdir)../../../..
+PLTSRCDIR = $(srcdir)/../../../..
 
 ###########################
 #      Common Macros      #
@@ -35,6 +35,7 @@ CXX = @CXX@
 LINKER = $(CXX)
 PERL = @PERL@
 RANLIB = @RANLIB@
+NICEAR = $(PLTSRCDIR)/utils/nicear
 AR = @STATIC_AR@
 ARFLAGS = @ARFLAGS@
 OPTIONS = @OPTIONS@ @MROPTIONS@
@@ -73,7 +74,7 @@ clean:
 	rm -f *.@LTO@ libXpm.@LIBSFX@
 
 libXpm.@LIBSFX@: $(OBJS)
-	$(AR) $(ARFLAGS) libXpm.@LIBSFX@ $(OBJS)
+	$(NICEAR) $(AR) $(ARFLAGS) libXpm.@LIBSFX@ $(OBJS)
 	$(RANLIB) libXpm.@LIBSFX@
 
 # Other dependencies.