fix configure logic errors #55434

2 files changed, 109 insertions, 1 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 91adbf2deb46..b7490506e865 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.26 2004/06/29 09:55:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.27 2004/07/02 02:58:42 vapier Exp $
+
+  01 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/zlib-1.2.1-configure.patch:
+  Patch the custom configure file to not error when warnings are spat out #55434
+  by Honza.
 
   29 Jun 2004; Joshua Kinard <kumba@gentoo.org> zlib-1.2.1-r2.ebuild:
   Marked stable on sparc and mips.
diff --git a/sys-libs/zlib/files/zlib-1.2.1-configure.patch b/sys-libs/zlib/files/zlib-1.2.1-configure.patch
new file mode 100644
index 000000000000..477fc5c26b53
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-configure.patch
@@ -0,0 +1,103 @@
+--- configure.orig	2004-06-29 18:49:20.065187520 -0400
++++ configure	2004-06-29 18:52:54.142642800 -0400
+@@ -160,8 +160,8 @@
+ if test $shared -eq 1; then
+   echo Checking for shared library support...
+   # we must test in two steps (cc then ld), required at least on SunOS 4.x
+-  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+-     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
++  if ($CC -c $SFLAGS $test.c) 2>/dev/null &&
++     ($LDSHARED -o $test$shared_ext $test.o) 2>/dev/null; then
+     CFLAGS="$SFLAGS"
+     LIBS="$LIBS $SHAREDLIBV"
+     echo Building shared library $SHAREDLIBV with $CC.
+@@ -185,7 +185,7 @@
+ #include <unistd.h>
+ int main() { return 0; }
+ EOF
+-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+   sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h
+   echo "Checking for unistd.h... Yes."
+ else
+@@ -208,7 +208,7 @@
+ }
+ EOF
+ 
+-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+   echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"
+ 
+   cat > $test.c <<EOF
+@@ -232,7 +232,7 @@
+ }
+ EOF
+ 
+-  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
++  if ($CC $CFLAGS -o $test $test.c) 2>/dev/null; then
+     echo "Checking for vsnprintf() in stdio.h... Yes."
+ 
+     cat >$test.c <<EOF
+@@ -257,7 +257,7 @@
+ }
+ EOF
+ 
+-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++    if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+       echo "Checking for return value of vsnprintf()... Yes."
+     else
+       CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
+@@ -295,7 +295,7 @@
+ }
+ EOF
+ 
+-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++    if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+       echo "Checking for return value of vsprintf()... Yes."
+     else
+       CFLAGS="$CFLAGS -DHAS_vsprintf_void"
+@@ -325,7 +325,7 @@
+ }
+ EOF
+ 
+-  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
++  if ($CC $CFLAGS -o $test $test.c) 2>/dev/null; then
+     echo "Checking for snprintf() in stdio.h... Yes."
+ 
+     cat >$test.c <<EOF
+@@ -344,7 +344,7 @@
+ }
+ EOF
+ 
+-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++    if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+       echo "Checking for return value of snprintf()... Yes."
+     else
+       CFLAGS="$CFLAGS -DHAS_snprintf_void"
+@@ -376,7 +376,7 @@
+ }
+ EOF
+ 
+-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++    if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+       echo "Checking for return value of sprintf()... Yes."
+     else
+       CFLAGS="$CFLAGS -DHAS_sprintf_void"
+@@ -392,7 +392,7 @@
+ #include <errno.h>
+ int main() { return 0; }
+ EOF
+-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+   echo "Checking for errno.h... Yes."
+ else
+   echo "Checking for errno.h... No."
+@@ -407,7 +407,7 @@
+   return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
+ }
+ EOF
+-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
++if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+   CFLAGS="$CFLAGS -DUSE_MMAP"
+   echo Checking for mmap support... Yes.
+ else