Work around a lang/gcc44 bug which causes problems for the sincos(3)

configure test in graphviz.
The expression tested is constant folded and optimized away even though we
don't have sincos(3) in the math library. When graphviz later tries
to use sincos(3) on a variable argument we get an unresolved symbol.

3 files changed, 48 insertions, 22 deletions

diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 1a5eec2cd4e..d587f0c0ddf 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2009/09/13 11:17:30 sno Exp $
+$NetBSD: distinfo,v 1.36 2009/09/24 15:53:12 tnn Exp $
 
 SHA1 (graphviz-2.24.0.tar.gz) = 1d91b3a7d2c7fa15e5e718eb456210cd15731e14
 RMD160 (graphviz-2.24.0.tar.gz) = d003cfa57e73c44fbb71ae8f8726ecc9c74735f9
 Size (graphviz-2.24.0.tar.gz) = 16746568 bytes
-SHA1 (patch-aa) = c9942207526b60caa90406a5204737be1207b71f
-SHA1 (patch-ab) = 01aae00529da57b9d5dd5ee27c2b9bbef3809d5d
+SHA1 (patch-aa) = 6474c4820e8594259700fca68bc11f04b619f20f
+SHA1 (patch-ab) = d7f1fc601aa959db1da1def19cfeba15e8ef98d6
 SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
 SHA1 (patch-aj) = 743e72721f08e99661b09a49b867056dc1c97d3c
 SHA1 (patch-ak) = a70995383b63f51f7ddd3412ccf3867a61d3010d
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index 5201e9ce5f8..46f2f10651e 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
+$NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
 
---- configure.ac.orig	2009-04-25 18:39:34.000000000 +0000
-+++ configure.ac	2009-04-25 18:55:19.000000000 +0000
-@@ -83,13 +83,24 @@
+--- configure.ac.orig	2009-06-17 01:24:18.000000000 +0200
++++ configure.ac
+@@ -83,13 +83,24 @@ AC_SUBST(GVPLUGIN_VERSION)
  GRAPHVIZ_VERSION_BUILD=0
  GRAPHVIZ_VERSION_REVISION=0
  case "${host_os}" in
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
  	fi
  	;;
  esac
-@@ -807,7 +818,7 @@
+@@ -811,7 +822,7 @@ else
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
      
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -829,7 +840,7 @@
+@@ -833,7 +844,7 @@ else
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
              fi
          fi
      
-@@ -919,8 +930,8 @@
+@@ -923,8 +934,8 @@ else
          use_ocaml="No (ocaml not available)"
        else
          AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          AC_CHECK_HEADER(caml/mlvalues.h,[
-@@ -1006,13 +1017,13 @@
+@@ -1010,13 +1021,13 @@ else
        if test "x$PHP" = "x"; then
          use_php="No (php not available)"
        else
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2232,7 +2243,7 @@
+@@ -2324,7 +2335,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
  
  AC_ARG_WITH(platformsdkincludedir,
    [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
@@ -88,3 +88,16 @@ $NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
  
  AC_ARG_WITH(platformsdklibdir,
    [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
+@@ -2869,10 +2880,12 @@ AC_MSG_CHECKING(if have working sincos()
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdio.h>
+ 	#include <assert.h>
++	#include <time.h>
+ 	#define PI 3.14159265358979323846
+ 	extern void sincos(double x, double *s, double *c);
+ 	int main () {
+ 		double sinx=0.0, cosx=1.0;
++		sincos(time(NULL)&1,&sinx,&cosx);
+ 		sincos(PI/2.0,&sinx,&cosx);
+ 		assert(sinx>0.9999999);
+ 		assert(sinx<1.0000001);
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index 0952e43b882..edd02f5b915 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
+$NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
 
---- configure.orig	2009-04-25 18:25:48.000000000 +0000
-+++ configure	2009-04-25 18:53:35.000000000 +0000
-@@ -2593,11 +2593,18 @@
+--- configure.orig	2009-06-17 01:24:55.000000000 +0200
++++ configure
+@@ -2797,11 +2797,18 @@ case "${host_os}" in
  	# For the build number: months since Jan 2000, day of month from the timestamp
  	# For the revision number: hour, minute from the timestamp
  	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
  
  
  
-@@ -6448,6 +6455,9 @@
+@@ -6729,6 +6736,9 @@ test -n "$RC" || RC="false"
  	    ;;
  	*-sgi-irix* )
  	    ;;
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
      esac
  else
      for ac_prog in windres
-@@ -26307,7 +26317,7 @@
+@@ -26982,7 +26992,7 @@ $as_echo_n "checking for Lua headers and
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
  
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -26371,7 +26381,7 @@
+@@ -27046,7 +27056,7 @@ $as_echo_n "checking for Lua headers and
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
              fi
          fi
  
-@@ -26957,8 +26967,8 @@
+@@ -27650,8 +27660,8 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then
-@@ -27414,13 +27424,13 @@
+@@ -28111,13 +28121,13 @@ fi
        if test "x$PHP" = "x"; then
          use_php="No (php not available)"
        else
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -33333,7 +33343,7 @@
+@@ -34364,7 +34374,7 @@ fi
  
  # Check whether --with-platformsdkincludedir was given.
  if test "${with_platformsdkincludedir+set}" = set; then
@@ -91,3 +91,16 @@ $NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
  fi
  
  
+@@ -36981,10 +36991,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ 	#include <stdio.h>
+ 	#include <assert.h>
++	#include <time.h>
+ 	#define PI 3.14159265358979323846
+ 	extern void sincos(double x, double *s, double *c);
+ 	int main () {
+ 		double sinx=0.0, cosx=1.0;
++		sincos(time(NULL)&1,&sinx,&cosx);
+ 		sincos(PI/2.0,&sinx,&cosx);
+ 		assert(sinx>0.9999999);
+ 		assert(sinx<1.0000001);