gccxml_gem 0.9.1-x86-linux → 0.9.2-x86-linux

data/share/gccxml-0.9/Sun/5.8/{adaptation.patch → Cstd.patch}

@@ -1,7 +1,39 @@
-Common subdirectories: ./iso and ../result/iso
-diff -r -u ./istream ../result/istream
---- ./istream	Fri Nov 16 16:40:47 2007
-+++ ../result/istream	Fri Nov 16 15:22:16 2007
+diff -r -u old/algorithm new/algorithm
+--- old/algorithm	2009-06-05 10:01:07.000000000 +0200
++++ new/algorithm	2009-06-05 10:01:43.000000000 +0200
+@@ -880,6 +880,11 @@
+                                RandomAccessIterator last, Pointer buffer,
+                                Distance buffer_size, T*, Compare comp);
+ 
++#if !defined(__MINMAX_DEFINED) 
++  template <class T>
++  inline const T& (min)(const T& a, const T& b);
++#endif
++
+   template <class RandomAccessIterator, class Pointer, class Distance, class T>
+   inline void __stable_sort (RandomAccessIterator first,
+                              RandomAccessIterator last,
+diff -r -u old/istream new/istream
+--- old/istream	2009-06-05 10:01:07.000000000 +0200
++++ new/istream	2009-06-05 10:01:43.000000000 +0200
+@@ -67,7 +67,7 @@
+ 
+     _EXPLICIT basic_istream(basic_streambuf<charT, traits> *sb);
+ 
+-    _EXPLICIT basic_istream(EmptyCtor) : basic_ios<charT, traits>(1) {}
++    _EXPLICIT basic_istream(ios_base::EmptyCtor) : basic_ios<charT, traits>(1) {}
+     virtual ~basic_istream();
+ 
+     class sentry 
+@@ -307,7 +307,7 @@
+           }
+           else
+           {
+-            ostream_type* ost = stream.tie();
++            basic_ostream<charT, traits>* ost = stream.tie();
+             if (ost && ost->rdbuf() != sb) 
+               ost->flush();
+ 
 @@ -419,9 +419,11 @@
          const istream_iterator<T,charT,traits,Distance>& x,
          const istream_iterator<T,charT,traits,Distance>& y);
@@ -15,37 +47,62 @@ diff -r -u ./istream ../result/istream
  #endif
    public: 
      typedef charT char_type;
-diff -r -u ./math.h ../result/math.h
---- ./math.h	Fri Nov 16 17:25:29 2007
-+++ ../result/math.h	Fri Nov 16 15:22:16 2007
-@@ -313,6 +313,11 @@
- #endif
- /* END adopted by C99 */
+diff -r -u old/ostream new/ostream
+--- old/ostream	2009-06-05 10:01:07.000000000 +0200
++++ new/ostream	2009-06-05 10:01:43.000000000 +0200
+@@ -88,7 +88,7 @@
+     typedef basic_ios<charT, traits>               ios_type;
  
-+/* SMOSS 29/08/07 <floatingpoint.h> conflicts with stdlib_iso.h */
-+#ifdef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif //__EXTENSIONS__
-+/* END SMOSS 29/08/07 <floatingpoint.h> conflicts with stdlib_iso.h */
- #if defined(__EXTENSIONS__) || !defined(__cplusplus)
- #include <floatingpoint.h>
- #endif
-@@ -319,6 +324,11 @@
- #endif	/* defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) */
- #endif	/* defined(__EXTENSIONS__) || defined(_XOPEN_SOURCE) || ... */
+     _EXPLICIT basic_ostream(basic_streambuf<charT, traits> *sb);
+-    _EXPLICIT basic_ostream(EmptyCtor) : basic_ios<charT, traits>(1) {}
++    _EXPLICIT basic_ostream(ios_base::EmptyCtor) : basic_ios<charT, traits>(1) {}
+     virtual ~basic_ostream();
  
-+/* SMOSS 29/08/07 <floatingpoint.h> conflicts with stdlib_iso.h */
-+#ifdef __EXTENSIONS__
-+# define __EXTENSIONS__
-+#endif //__EXTENSIONS__
-+/* END SMOSS 29/08/07 <floatingpoint.h> conflicts with stdlib_iso.h */
- #if defined(__cplusplus) && defined(__GNUC__)
- #undef	exception
- #endif
-Common subdirectories: ./rw and ../result/rw
-diff -r -u ./streambuf ../result/streambuf
---- ./streambuf	Fri Nov 16 16:40:47 2007
-+++ ../result/streambuf	Fri Nov 16 15:22:16 2007
+     class sentry {
+@@ -97,8 +97,7 @@
+       sentry(basic_ostream<charT,traits>& stream)
+         : __stream(stream)                  
+       {  
+-                      
+-        streambuf_type* sb = stream.rdbuf();
++        basic_streambuf<charT, traits>* sb = stream.rdbuf();
+         if ( sb ) {
+           stream.rdbuf()->buffer_mutex_.acquire();
+         }
+diff -r -u old/rw/iterator new/rw/iterator
+--- old/rw/iterator	2009-06-05 10:01:07.000000000 +0200
++++ new/rw/iterator	2009-06-05 10:01:43.000000000 +0200
+@@ -426,10 +426,12 @@
+     friend inline difference_type (std::operator-) (const self& x, const self& y);
+     friend inline self (std::operator+)     (difference_type n, const self& x);
+ #else
+-    friend inline bool operator== <>   (const self& x, const self& y);
+-    friend inline bool operator<  <>   (const self& x, const self& y);
+-    friend inline difference_type operator- <> (const self& x, const self& y);
+-    friend inline self operator+  <>   (difference_type n, const self& x);
++/* SMOSS 29/08/07 removing 'inline' from friend declarations */
++    friend /*inline*/ bool operator== <>   (const self& x, const self& y);
++    friend /*inline*/ bool operator<  <>   (const self& x, const self& y);
++    friend /*inline*/ difference_type operator- <> (const self& x, const self& y);
++    friend /*inline*/ self operator+  <>   (difference_type n, const self& x);
++/* END SMOSS 29/08/07 removing 'inline' from friend declarations */
+ #endif        
+   protected:
+ 
+@@ -581,7 +583,9 @@
+     typedef Reference reference;
+     typedef Pointer pointer;
+ 
+-    friend inline bool operator== <>   (const self& x, const self& y);
++/* SMOSS 29/08/07 removing 'inline' from friend declarations */
++    friend /*inline*/ bool operator== <>   (const self& x, const self& y);
++/* END SMOSS 29/08/07 removing 'inline' from friend declarations */
+         
+   protected:
+ 
+diff -r -u old/streambuf new/streambuf
+--- old/streambuf	2009-06-05 10:01:07.000000000 +0200
++++ new/streambuf	2009-06-05 10:01:43.000000000 +0200
 @@ -927,7 +927,10 @@
     * int_type snextc()
     * returns the next character
@@ -70,9 +127,9 @@ diff -r -u ./streambuf ../result/streambuf
  
    /*
     * basic_streambuf *pubsetbuf(char_type *, streamsize)
-diff -r -u ./string ../result/string
---- ./string	Fri Nov 16 16:40:47 2007
-+++ ../result/string	Fri Nov 16 15:22:16 2007
+diff -r -u old/string new/string
+--- old/string	2009-06-05 10:01:07.000000000 +0200
++++ new/string	2009-06-05 10:01:43.000000000 +0200
 @@ -797,7 +797,9 @@
      // Null string ref
      //
@@ -84,10 +141,9 @@ diff -r -u ./string ../result/string
  #endif
  
      static __string_ref_type * __getNullRep ()
-Common subdirectories: ./sys and ../result/sys
-diff -r -u ./typeinfo ../result/typeinfo
---- ./typeinfo	Fri Nov 16 16:40:47 2007
-+++ ../result/typeinfo	Fri Nov 16 15:22:16 2007
+diff -r -u old/typeinfo new/typeinfo
+--- old/typeinfo	2009-06-05 10:01:07.000000000 +0200
++++ new/typeinfo	2009-06-05 10:01:43.000000000 +0200
 @@ -34,7 +34,8 @@
  	// Implementation
  	const void* __data;
@@ -98,71 +154,3 @@ diff -r -u ./typeinfo ../result/typeinfo
      };
  
      class bad_typeid: public exception {
-diff -r -u ./iso/stdlib_iso.h ../result/iso/stdlib_iso.h
---- ./iso/stdlib_iso.h	Fri Nov 16 16:40:47 2007
-+++ ../result/iso/stdlib_iso.h	Fri Nov 16 15:22:16 2007
-@@ -110,8 +110,10 @@
- extern double atof(const char *);
- extern int atoi(const char *);
- extern long int atol(const char *);
-+/* SMOSS 29/08/07
- extern void *bsearch(const void *, const void *, size_t, size_t,
- 	int (*)(const void *, const void *));
-+*/
- #if __cplusplus >= 199711L
- extern "C++" {
- 	void *bsearch(const void *, const void *, size_t, size_t,
-@@ -131,7 +133,6 @@
- extern size_t mbstowcs(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD,
- 	size_t);
- extern int mbtowc(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t);
--extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
- #if __cplusplus >= 199711L
- extern "C++" {
- 	void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
-diff -r -u ./rw/iterator ../result/rw/iterator
---- ./rw/iterator	Fri Nov 16 17:03:59 2007
-+++ ../result/rw/iterator	Fri Nov 16 15:22:16 2007
-@@ -426,10 +426,12 @@
-     friend inline difference_type (std::operator-) (const self& x, const self& y);
-     friend inline self (std::operator+)     (difference_type n, const self& x);
- #else
--    friend inline bool operator== <>   (const self& x, const self& y);
--    friend inline bool operator<  <>   (const self& x, const self& y);
--    friend inline difference_type operator- <> (const self& x, const self& y);
--    friend inline self operator+  <>   (difference_type n, const self& x);
-+/* SMOSS 29/08/07 removing 'inline' from friend declarations */
-+    friend /*inline*/ bool operator== <>   (const self& x, const self& y);
-+    friend /*inline*/ bool operator<  <>   (const self& x, const self& y);
-+    friend /*inline*/ difference_type operator- <> (const self& x, const self& y);
-+    friend /*inline*/ self operator+  <>   (difference_type n, const self& x);
-+/* END SMOSS 29/08/07 removing 'inline' from friend declarations */
- #endif        
-   protected:
- 
-@@ -581,7 +583,9 @@
-     typedef Reference reference;
-     typedef Pointer pointer;
- 
--    friend inline bool operator== <>   (const self& x, const self& y);
-+/* SMOSS 29/08/07 removing 'inline' from friend declarations */
-+    friend /*inline*/ bool operator== <>   (const self& x, const self& y);
-+/* END SMOSS 29/08/07 removing 'inline' from friend declarations */
-         
-   protected:
- 
-diff -r -u ./sys/regset.h ../result/sys/regset.h
---- ./sys/regset.h	Fri Nov 16 16:40:47 2007
-+++ ../result/sys/regset.h	Fri Nov 16 15:22:16 2007
-@@ -16,7 +16,10 @@
- #pragma ident	"@(#)regset.h	1.28	04/09/28 SMI"	/* SVr4.0 1.1	*/
- 
- #include <sys/feature_tests.h>
--
-+/* SMOSS 29/08/07     */
-+//#include <inttypes.h>
-+typedef long long unsigned int uint64_t;
-+/* end SMOSS 29/08/08 */
- #if !defined(_ASM)
- #include <sys/int_types.h>
- #endif

data/share/gccxml-0.9/Sun/5.8/adapt_headers.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+cd `dirname $0`
+
+#########################################
+# Patch STL Headers (Non-STLport)
+#########################################
+
+CC_INCLUDES=`../find_flags "$@" | perl -ne '($a) = m|-I([/a-zA-Z0-9\._-]+/include/CC)|o ; print "$a\n" if $a'`
+
+mkdir -p rw
+
+cp $CC_INCLUDES/typeinfo .
+cp $CC_INCLUDES/Cstd/istream .
+cp $CC_INCLUDES/Cstd/ostream .
+cp $CC_INCLUDES/Cstd/streambuf .
+cp $CC_INCLUDES/Cstd/string .
+cp $CC_INCLUDES/Cstd/algorithm .
+cp $CC_INCLUDES/Cstd/rw/iterator rw/iterator
+
+gpatch -p1 < Cstd.patch
+
+#########################################
+# Patch the standard headers
+#########################################
+
+if [ `uname -r` = "5.10" ]
+then
+  mkdir -p iso
+  cp /usr/include/iso/stdlib_iso.h iso
+  gpatch -p1 < std-5.10.patch
+fi

data/share/gccxml-0.9/Sun/5.8/std-5.10.patch

@@ -0,0 +1,22 @@
+diff -r -u old/iso/stdlib_iso.h new/iso/stdlib_iso.h
+--- old/iso/stdlib_iso.h	Wed May 20 12:02:31 2009
++++ new/iso/stdlib_iso.h	Wed May 20 12:01:23 2009
+@@ -110,8 +110,10 @@
+ extern double atof(const char *);
+ extern int atoi(const char *);
+ extern long int atol(const char *);
++/* SMOSS 29/08/07
+ extern void *bsearch(const void *, const void *, size_t, size_t,
+ 	int (*)(const void *, const void *));
++*/
+ #if __cplusplus >= 199711L
+ extern "C++" {
+ 	void *bsearch(const void *, const void *, size_t, size_t,
+@@ -131,7 +133,6 @@
+ extern size_t mbstowcs(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD,
+ 	size_t);
+ extern int mbtowc(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t);
+-extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
+ #if __cplusplus >= 199711L
+ extern "C++" {
+ 	void qsort(void *, size_t, size_t, int (*)(const void *, const void *));

data/share/gccxml-0.9/Sun/README

@@ -1,8 +1,8 @@
 Sun CC support contributed by Pierre-Olivier Gaillard
 
-This is a small README file regarding gccxml support for Solaris and Sun CC 5.8.
+This is a small README file regarding gccxml support for Solaris and Sun CC.
 
-The Sun CC headers are not suitable for GCC and need to be adapted. The adapted files may not be redistributed freely. This forces you to perform the following operations:
- ./adapt_headers.sh
+The Sun CC headers are not suitable for GCC and need to be adapted. The modified files may not be redistributed freely. This forces you to perform the following operations:
+ ./<CC-version>/adapt_headers.sh
 
-This will produce corrected header files in the 5.8 directory.
+This will produce corrected header files in the corresponding directory.

data/share/gccxml-0.9/Sun/find_flags

@@ -4,8 +4,8 @@
 #  Program:   GCC-XML
 #  Module:    $RCSfile: find_flags,v $
 #  Language:  C++
-#  Date:      $Date: 2007/11/28 19:52:06 $
-#  Version:   $Revision: 1.1 $
+#  Date:      $Date: 2009-06-09 18:18:01 $
+#  Version:   $Revision: 1.2 $
 #
 #  Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
 #  See Copyright.txt for details.
@@ -15,7 +15,8 @@
 #     PURPOSE.  See the above copyright notices for more information.
 #
 #=============================================================================
-# Find the CC executable name.
+
+# Find the compiler executable name.
 if test "x$1" = "x" ; then
   if test "x${CXX}" = "x" ; then
     CXX=CC
@@ -26,44 +27,25 @@ else
   CXXFLAGS="$@"
 fi
 
-GCCXML_PID="$$"
-cat > "/tmp/gccxml_identify_compiler_args$GCCXML_PID.cc" <<!
-#include <>
-!
-
-# Find the macro definition options.
-MACROS=`${CXX} /tmp/gccxml_identify_compiler_args$GCCXML_PID.cc -E -xdumpmacros=defs 2>&1 |
-       awk '{ if ($1 ~ /#define/) printf("-D%s=%s %s %s ",$2,$3,$4,$5) }'
-       ` 
-MACROS="-D__cplusplus=199711L -D__STDC__ -D_REENTRANT $MACROS"
-
-# Find the include path options.
-#todo test for truss
-INCLUDES=`truss -f -t openat ${CXX} -E /tmp/gccxml_identify_compiler_args$GCCXML_PID.cc 2>&1 |
-         awk '{if ($3 ~ /\"[A-Za-z0-9_\/.-]+\",/ && $3 !~ /tmp/)
-                 if (tempString!=substr($3,2,length($3)-3))
-                 {
-                    tempString=substr($3,2,length($3)-3);
-                    printf("-I%s ",tempString)
-                 }
-               }'`
-
-#cleanup
-rm -rf "/tmp/gccxml_identify_compiler_args$GCCXML_PID.cc"
+# Find the compiler version
+CXX_VERSION=`${CXX} -V 2>&1 | awk '{print $4}'`
+[ -z "${CXX_VERSION}" ] && echo "Could not find compiler version" && exit 1
 
-# The support headers are located where this script is.
-SELFPATH=`echo $0 | sed -n '/\//{s/\/find_flags//;p;}'`
-if test "x$SELFPATH" = "x" ; then SELFPATH="." ; fi
-SELFPATH=`cd "$SELFPATH" ; pwd`
+# Compute the script dir
+SCRIPT_DIR=`dirname $0`
+if test "x$SCRIPT_DIR" = "x" ; then SCRIPT_DIR="." ; fi
+SCRIPT_DIR=`cd "$SCRIPT_DIR" ; pwd`
 
-# Find CC version
-CC_VERSION=`${CXX} -V 2>&1 | awk '{print $4}'`
+# Compute the version-specific support dir
+CXX_SUPPORT_DIR="$SCRIPT_DIR/$CXX_VERSION"
 
-# Use hacked headers for CC 5.8
-if [ $CC_VERSION = 5.8 ]; then
-  INCLUDES="-iwrapper\"$SELFPATH/5.8\" $INCLUDES"
+# Use the version-specific find_flags if available
+if [ -f "$CXX_SUPPORT_DIR/find_flags" ]
+then
+  . "$CXX_SUPPORT_DIR/find_flags"
+else
+  . "$SCRIPT_DIR/find_flags_common"
 fi
  
-# Format and print out the options.
-OPTIONS="$MACROS $INCLUDES $SPECIAL"
+# Print out the options
 echo $OPTIONS

data/share/gccxml-0.9/Sun/find_flags_common

@@ -0,0 +1,42 @@
+#!/bin/sh
+#=============================================================================
+#
+#  Program:   GCC-XML
+#  Module:    $RCSfile: find_flags_common,v $
+#  Language:  C++
+#  Date:      $Date: 2009-06-09 18:18:01 $
+#  Version:   $Revision: 1.1 $
+#
+#  Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+#  See Copyright.txt for details.
+#
+#     This software is distributed WITHOUT ANY WARRANTY; without even 
+#     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+#     PURPOSE.  See the above copyright notices for more information.
+#
+#=============================================================================
+
+GCCXML_PID="$$"
+cat > "/tmp/gccxml_identify_compiler_args$GCCXML_PID.cc" <<!
+#include <>
+!
+
+# Find the macro definition options.
+MACROS=`${CXX} ${CXXFLAGS} /tmp/gccxml_identify_compiler_args$GCCXML_PID.cc -E -xdumpmacros=defs 2>&1 |
+       awk '{ if ($1 ~ /#define/) printf("-D%s=%s %s %s ",$2,$3,$4,$5) }'` 
+MACROS="-D__cplusplus=199711L -D__STDC__ -D_REENTRANT $MACROS"
+
+# Find the include path options.
+INCLUDES="`echo '' | ${CXX} -v -E ${CXXFLAGS} ~ 2>&1 | perl -ne 'print m|(-I/[/a-zA-Z0-9\._-]+\s*)|og'`"
+INCLUDES="$INCLUDES -I/usr/include"
+
+# Use hacked headers
+if [ -d "$CXX_SUPPORT_DIR" ]; then
+  INCLUDES="-iwrapper\"$CXX_SUPPORT_DIR\" $INCLUDES"
+fi
+
+# Cleanup
+rm -rf "/tmp/gccxml_identify_compiler_args$GCCXML_PID.cc"
+ 
+# Format the options.
+OPTIONS="$MACROS $INCLUDES $SPECIAL"

data/share/gccxml-0.9/gccxml_config

@@ -1,2 +1,2 @@
 GCCXML_COMPILER="/usr/bin/c++"
-GCCXML_CXXFLAGS=" "
+GCCXML_CXXFLAGS=""

data/share/gccxml-0.9/gccxml_identify_compiler.cc

@@ -0,0 +1,13 @@
+#if defined(__GNUC__)
+GCCXML_SUPPORT="GCC"
+#elif defined(__sgi) && defined(_COMPILER_VERSION)
+GCCXML_SUPPORT="MIPSpro"
+#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 700)
+GCCXML_SUPPORT="Intel"
+#elif defined(__SUNPRO_CC)
+GCCXML_SUPPORT="Sun"
+#elif defined(__IBMCPP__)
+GCCXML_SUPPORT="IBM"
+#else
+GCCXML_SUPPORT=""
+#endif

data/share/man/man1/gccxml.1

@@ -1,4 +1,4 @@
-.TH GCC-XML 1 "May 11, 2008" "GCC-XML 0.9.0"
+.TH GCC-XML 1 "October 11, 2009" "GCC-XML 0.9.0"
 .SH NAME
 .TP
 .B gccxml