- Fix build on x86_64 [1]

- Fix build with gcc 4.2.1.

Pointed out by:	kris via pointyhat [1]

2 files changed, 39 insertions, 8 deletions

diff --git a/lang/cint/files/patch-configure b/lang/cint/files/patch-configure
index 4cd0ad381f8c..4731490254ea 100644
--- a/lang/cint/files/patch-configure
+++ b/lang/cint/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Nov 24 14:30:23 2006
-+++ configure	Tue Aug 21 15:02:00 2007
+--- configure.orig	2006-11-24 08:30:23.000000000 +0000
++++ configure	2007-08-23 05:06:38.042002000 +0000
 @@ -20,7 +20,7 @@
  
  # configure settings to build CINT
@@ -9,19 +9,21 @@
  
  #############################################################
  ###
-@@ -102,6 +102,11 @@
+@@ -102,6 +102,13 @@
      config_GCC_defaults
  }
  
 +function config_freebsd {
 +    config_GCC_defaults
++    CFLAGS="${CFLAGS} -fPIC"
++    CXXFLAGS="${CXXFLAGS} -fPIC"
 +    DEFAULTLIBS="`echo $DEFAULTLIBS | sed 's/-ldl//'`"
 +}
 +
  function config_linuxx8664gcc {
      config_GCC_defaults
  
-@@ -326,7 +331,7 @@
+@@ -326,7 +333,7 @@
  #        freebsd*:*:6*)         arch=freebsd5        ;;
  #        freebsd*:*:5*)         arch=freebsd5        ;;
  #        freebsd*:*:4*)         arch=freebsd4        ;;
@@ -30,12 +32,12 @@
  #        hp-ux:ia64:*)          arch=hpuxia64acc     ;;
  #        hp-ux:*:*)             arch=hpuxacc         ;;
  #        hurd*:*:*)             arch=hurddeb         ;;
-@@ -356,6 +361,8 @@
- #            ;;
+@@ -357,6 +364,8 @@
      esac
      if [ "x`uname -a|grep -i linux`" != "x" ]; then
-+        GUESSEDARCH=$arch
-+    elif [ "x`uname -a|grep -i freebsd`" != "x" ]; then
          GUESSEDARCH=$arch
++    elif [ "x`uname -a|grep -i freebsd`" != "x" ]; then
++        GUESSEDARCH=$arch
      elif cl.exe >/dev/null 2>&1; then
          if [ "x`cl 2>&1|grep 'Version 14'`" != "x" ]; then
+             GUESSEDARCH=msvc8
diff --git a/lang/cint/files/patch-src-gcc3strm.cxx b/lang/cint/files/patch-src-gcc3strm.cxx
new file mode 100644
index 000000000000..e47249a0f2c6
--- /dev/null
+++ b/lang/cint/files/patch-src-gcc3strm.cxx
@@ -0,0 +1,29 @@
+--- src/gcc3strm.cxx.orig	2007-08-23 05:01:30.049002000 +0000
++++ src/gcc3strm.cxx	2007-08-23 05:02:36.423000000 +0000
+@@ -306,6 +306,7 @@
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
++#if 0
+ static int G__G__stream_7_7_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
+ {
+       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
+@@ -317,6 +318,7 @@
+       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
+    return(1 || funcname || hash || result7 || libp) ;
+ }
++#endif
+ 
+ // automatic destructor
+ typedef fpos<mbstate_t> G__TfposlEmbstate_tgR;
+@@ -3961,8 +3963,10 @@
+    G__memfunc_setup("operator streamoff",1875,G__G__stream_7_4_0, 110, -1, G__defined_typename("streamoff"), 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("operator+",919,G__G__stream_7_5_0, 117, G__get_linked_tagnum(&G__G__streamLN_fposlEmbstate_tgR), -1, 0, 1, 1, 1, 0, "n - 'streamoff' 0 - a", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("operator-",921,G__G__stream_7_6_0, 117, G__get_linked_tagnum(&G__G__streamLN_fposlEmbstate_tgR), -1, 0, 1, 1, 1, 0, "n - 'streamoff' 0 - a", (char*)NULL, (void*) NULL, 0);
++#if 0
+    G__memfunc_setup("operator==",998,G__G__stream_7_7_0, 103, -1, -1, 0, 1, 1, 1, 0, "u 'fpos<mbstate_t>' - 11 - a", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("operator!=",970,G__G__stream_7_8_0, 103, -1, -1, 0, 1, 1, 1, 0, "u 'fpos<mbstate_t>' - 11 - a", (char*)NULL, (void*) NULL, 0);
++#endif
+    // automatic destructor
+    G__memfunc_setup("~fpos<mbstate_t>", 1651, G__G__stream_7_9_0, (int) ('y'), -1, -1, 0, 0, 1, 1, 0, "", (char*) NULL, (void*) NULL, 0);
+    // automatic assignment operator