Thu Mar 3 18:02:53 2011 UTC ()
Add patches to fix build on NetBSD 5.99.41 and newer (pkg/44598).
Patches came from Kai-Uwe Eckhardt.


(hans)
diff -r1.5 -r1.6 pkgsrc/lang/gcc44/distinfo
diff -r0 -r1.1 pkgsrc/lang/gcc44/patches/patch-ah
diff -r0 -r1.1 pkgsrc/lang/gcc44/patches/patch-ai
diff -r0 -r1.1 pkgsrc/lang/gcc44/patches/patch-aj
diff -r0 -r1.1 pkgsrc/lang/gcc44/patches/patch-ak
diff -r0 -r1.1 pkgsrc/lang/gcc44/patches/patch-al
cvs diff -r1.5 -r1.6 pkgsrc/lang/gcc44/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/distinfo 2011/02/25 13:34:56 1.5
+++ pkgsrc/lang/gcc44/Attic/distinfo 2011/03/03 18:02:53 1.6
@@ -1,12 +1,17 @@ @@ -1,12 +1,17 @@
1$NetBSD: distinfo,v 1.5 2011/02/25 13:34:56 hans Exp $ 1$NetBSD: distinfo,v 1.6 2011/03/03 18:02:53 hans Exp $
2 2
3SHA1 (gcc-4.4.5.tar.bz2) = 2b1427a932a620c909d74f1e4821ed90c90fd350 3SHA1 (gcc-4.4.5.tar.bz2) = 2b1427a932a620c909d74f1e4821ed90c90fd350
4RMD160 (gcc-4.4.5.tar.bz2) = 87d6fa77d50f23a3359e24bf5b0ddfafa7088478 4RMD160 (gcc-4.4.5.tar.bz2) = 87d6fa77d50f23a3359e24bf5b0ddfafa7088478
5Size (gcc-4.4.5.tar.bz2) = 63081552 bytes 5Size (gcc-4.4.5.tar.bz2) = 63081552 bytes
6SHA1 (patch-aa) = b90dbd935aa105b86a7dd0f3f5f76727bd2d55fb 6SHA1 (patch-aa) = b90dbd935aa105b86a7dd0f3f5f76727bd2d55fb
7SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88 7SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88
8SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee 8SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
9SHA1 (patch-ad) = 86dc05e6ea977ad869e5d63beb493750ab01a807 9SHA1 (patch-ad) = 86dc05e6ea977ad869e5d63beb493750ab01a807
10SHA1 (patch-ae) = 831481496b5b5f246f51d9a4fe9314f07f81a842 10SHA1 (patch-ae) = 831481496b5b5f246f51d9a4fe9314f07f81a842
11SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621 11SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
12SHA1 (patch-ag) = 077bed181ee4bad36eb23c817a1708950b69a1ad 12SHA1 (patch-ag) = 077bed181ee4bad36eb23c817a1708950b69a1ad
 13SHA1 (patch-ah) = f931e56bdc9aac160d5320f33c3af3b0d76c6d22
 14SHA1 (patch-ai) = a7329ed9f8bb533c4bf0c2f4cc97b6c49d737148
 15SHA1 (patch-aj) = 65ba5e1160a3c5934a7098db2f870fa5db63a267
 16SHA1 (patch-ak) = 891dab9be4f76fef17027c70daee3afcfb720fee
 17SHA1 (patch-al) = 7b21a8968302a3da1c4cfd881cfe8eac1341fa11
File Added: pkgsrc/lang/gcc44/patches/Attic/patch-ah
--- libgfortran/intrinsics/c99_functions.c.orig	2009-04-10 01:23:07.000000000 +0200
+++ libgfortran/intrinsics/c99_functions.c
@@ -538,7 +538,7 @@
   if (x > DBL_MAX || x < -DBL_MAX)
     {
 #ifdef HAVE_NEXTAFTERL
-      static long double prechalf = nexafterl (0.5L, LDBL_MAX);
+      long double prechalf = nextafterl (0.5L, LDBL_MAX);
 #else
       static long double prechalf = 0.5L;
 #endif
File Added: pkgsrc/lang/gcc44/patches/Attic/patch-ai
--- gcc/fortran/f95-lang.c.orig	2010-04-21 23:26:11.000000000 +0200
+++ gcc/fortran/f95-lang.c
@@ -871,10 +871,17 @@
 
   gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, 
 		      BUILT_IN_CABSL, "cabsl", true);
+#if defined (__NetBSD__)
+  gfc_define_builtin ("__builtin_cabs", func_cdouble_double, 
+		      BUILT_IN_CABS, "__c99_cabs", true);
+  gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, 
+		      BUILT_IN_CABSF, "__c99_cabsf", true);
+#else
   gfc_define_builtin ("__builtin_cabs", func_cdouble_double, 
 		      BUILT_IN_CABS, "cabs", true);
   gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, 
 		      BUILT_IN_CABSF, "cabsf", true);
+#endif
  
   gfc_define_builtin ("__builtin_copysignl", mfunc_longdouble[1], 
 		      BUILT_IN_COPYSIGNL, "copysignl", true);
File Added: pkgsrc/lang/gcc44/patches/Attic/patch-aj
--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2009-04-10 01:23:07.000000000 +0200
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h	2011-03-03 13:57:27.000000000 +0100
@@ -30,6 +30,8 @@
 // Full details can be found from the CVS files at:
 //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
 // See www.netbsd.org for details of access.
+
+#include <sys/param.h>
   
 _GLIBCXX_BEGIN_NAMESPACE(std)
 
@@ -42,6 +44,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     // NB: Offsets into ctype<char>::_M_table force a particular size
     // on the mask type. Because of this, we don't use an enum.
     typedef unsigned char      	mask;
+#if __NetBSD_Version__ >= 599004100
+    static const mask upper    	= _CTYPE_U;
+    static const mask lower 	= _CTYPE_L;
+    static const mask alpha 	= _CTYPE_U | _CTYPE_L;
+    static const mask digit 	= _CTYPE_N;
+    static const mask xdigit 	= _CTYPE_N | _CTYPE_X;
+    static const mask space 	= _CTYPE_S;
+    static const mask print 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
+    static const mask graph 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
+    static const mask cntrl 	= _CTYPE_C;
+    static const mask punct 	= _CTYPE_P;
+    static const mask alnum 	= _CTYPE_U | _CTYPE_L | _CTYPE_N;
+#else
     static const mask upper    	= _U;
     static const mask lower 	= _L;
     static const mask alpha 	= _U | _L;
@@ -53,6 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     static const mask cntrl 	= _C;
     static const mask punct 	= _P;
     static const mask alnum 	= _U | _L | _N;
+#endif
   };
 
 _GLIBCXX_END_NAMESPACE
File Added: pkgsrc/lang/gcc44/patches/Attic/patch-ak
--- libjava/configure.host.orig	2011-02-25 16:07:42.000000000 +0100
+++ libjava/configure.host
@@ -310,6 +310,9 @@
   *-*-freebsd*)
 	slow_pthread_self=
 	;;
+  *-*-netbsd*)
+	slow_pthread_self=
+	;;
   *-mingw*)
         libgcj_flags="${libgcj_flags} -fno-omit-frame-pointer"
   	# FIXME: win32_exception_handler( ) in win32.cc does not do the
File Added: pkgsrc/lang/gcc44/patches/Attic/patch-al
--- libjava/configure.ac.orig	2011-02-25 16:08:27.000000000 +0100
+++ libjava/configure.ac
@@ -1011,6 +1011,11 @@
 	THREADLDFLAGS=-pthread
 	THREADSPEC=-lpthread
 	;;
+     *-*-netbsd*)
+	# NetBSD should work with pthread.
+	THREADLDFLAGS=-pthread
+	THREADSPEC=-lpthread
+	;;
      alpha*-dec-osf* | hppa*-hp-hpux*)
 	THREADCXXFLAGS=-pthread
 	# boehm-gc needs some functions from librt, so link that too.