# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1344110551 -7200
# Node ID 3236236104920b408071363d49772ad56d264001
# Parent  0746a003fc03c54f16b4b76dea473e6d740e7357
Update to new vendor software version and modernize packaging to 20100101.

diff -r 0746a003fc03 -r 323623610492 gcc/gcc.patch
--- a/gcc/gcc.patch	Sat Aug 04 14:16:14 2012 +0200
+++ b/gcc/gcc.patch	Sat Aug 04 22:02:31 2012 +0200
@@ -1,7 +1,6 @@
 Index: config.guess
-diff -Nau config.guess.orig config.guess
---- config.guess.orig	2011-03-21 16:02:29.000000000 +0100
-+++ config.guess	2011-03-27 18:06:45.404612233 +0200
+--- config.guess.orig	2011-06-06 12:34:35.000000000 +0200
++++ config.guess	2012-07-21 09:15:05.000000000 +0200
 @@ -194,7 +194,7 @@
  		release='-gnu'
  		;;
@@ -11,46 +10,10 @@
  		;;
  	esac
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-Index: gcc/config/alpha/osf5.h
-diff -Nau gcc/config/alpha/osf5.h.orig gcc/config/alpha/osf5.h
---- gcc/config/alpha/osf5.h.orig	2010-11-21 01:54:14.000000000 +0100
-+++ gcc/config/alpha/osf5.h	2011-03-27 18:06:45.432326155 +0200
-@@ -94,7 +94,7 @@
-    constructor and call-frame data structures are not accidentally
-    overridden.  */
- #define LINK_SPEC  \
--  "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
-+  "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
-    %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
-    %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
- 
-Index: gcc/config/i386/sol2-10.h
-diff -Nau gcc/config/i386/sol2-10.h.orig gcc/config/i386/sol2-10.h
---- gcc/config/i386/sol2-10.h.orig	2011-01-26 21:23:17.000000000 +0100
-+++ gcc/config/i386/sol2-10.h	2011-03-27 18:06:45.455032224 +0200
-@@ -105,7 +105,7 @@
-              -R /usr/ucblib/64} \
-    %{!compat-bsd: \
-      %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \
--             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}"
-+             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}} -rpath-link /lib/64:/usr/lib/64}"
- 
- #undef LINK_ARCH64_SPEC
- #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
-@@ -122,7 +122,7 @@
- #endif
- 
- #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \
--			    "%{!m64:-m " I386_EMULATION "} "
-+			    "%{!m64:} "
- #else
- #define TARGET_LD_EMULATION ""
- #endif
 Index: gcc/config/i386/sol2.h
-diff -Nau gcc/config/i386/sol2.h.orig gcc/config/i386/sol2.h
---- gcc/config/i386/sol2.h.orig	2011-02-02 17:58:49.000000000 +0100
-+++ gcc/config/i386/sol2.h	2011-03-27 18:06:45.458713885 +0200
-@@ -73,6 +73,9 @@
+--- gcc/config/i386/sol2.h.orig	2011-08-01 14:14:21.000000000 +0200
++++ gcc/config/i386/sol2.h	2012-07-21 09:15:05.000000000 +0200
+@@ -100,6 +100,9 @@
  #undef ASM_QUAD
  #endif
  
@@ -60,11 +23,22 @@
  /* The Solaris assembler wants a .local for non-exported aliases.  */
  #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET)	\
    do {							\
+Index: gcc/config/sol2-bi.h
+--- gcc/config/sol2-bi.h.orig	2011-07-07 11:24:16.000000000 +0200
++++ gcc/config/sol2-bi.h	2012-07-21 09:31:52.000000000 +0200
+@@ -75,7 +75,7 @@
+    %{YP,*} \
+    %{R*} \
+    %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}	\
+-	   %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}"
++	   %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}} -rpath-link %R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}"
+ 
+ #undef LINK_ARCH64_SPEC
+ #ifndef USE_GLD
 Index: gcc/config/sol2.h
-diff -Nau gcc/config/sol2.h.orig gcc/config/sol2.h
---- gcc/config/sol2.h.orig	2011-01-26 21:23:17.000000000 +0100
-+++ gcc/config/sol2.h	2011-03-27 18:06:45.477952967 +0200
-@@ -181,8 +181,8 @@
+--- gcc/config/sol2.h.orig	2011-08-18 16:47:46.000000000 +0200
++++ gcc/config/sol2.h	2012-07-21 09:15:05.000000000 +0200
+@@ -171,8 +171,8 @@
    "%{h*} %{v:-V} \
     %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
     %{static:-dn -Bstatic} \
@@ -72,28 +46,26 @@
 -   %{symbolic:-Bsymbolic -G -dy -z text} \
 +   %{shared:-G -dy} \
 +   %{symbolic:-Bsymbolic -G -dy} \
-    %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \
+    %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \
     %(link_arch) \
     %{Qy:} %{!Qn:-Qy}"
 Index: gcc/system.h
-diff -Nau gcc/system.h.orig gcc/system.h
---- gcc/system.h.orig	2011-01-09 13:41:33.000000000 +0100
-+++ gcc/system.h	2011-03-27 18:06:45.498233251 +0200
-@@ -430,10 +430,6 @@
- extern char *strstr (const char *, const char *);
+--- gcc/system.h.orig	2012-02-17 00:16:28.000000000 +0100
++++ gcc/system.h	2012-07-21 09:15:05.000000000 +0200
+@@ -455,10 +455,6 @@
+ }
  #endif
  
 -#ifdef HAVE_MALLOC_H
 -#include <malloc.h>
 -#endif
 -
- #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
- extern void *malloc (size_t);
+ #ifdef __cplusplus
+ extern "C" {
  #endif
 Index: libcpp/charset.c
-diff -Nau libcpp/charset.c.orig libcpp/charset.c
 --- libcpp/charset.c.orig	2011-01-03 21:52:22.000000000 +0100
-+++ libcpp/charset.c	2011-03-27 18:06:45.522800310 +0200
++++ libcpp/charset.c	2012-07-21 09:15:05.000000000 +0200
 @@ -75,6 +75,7 @@
  #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
  #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
@@ -103,9 +75,8 @@
  #endif
  
 Index: libcpp/internal.h
-diff -Nau libcpp/internal.h.orig libcpp/internal.h
---- libcpp/internal.h.orig	2010-09-29 20:18:38.000000000 +0200
-+++ libcpp/internal.h	2011-03-27 18:06:45.537431542 +0200
+--- libcpp/internal.h.orig	2012-01-09 09:48:43.000000000 +0100
++++ libcpp/internal.h	2012-07-21 09:15:05.000000000 +0200
 @@ -29,6 +29,7 @@
  #if HAVE_ICONV
  #include <iconv.h>
diff -r 0746a003fc03 -r 323623610492 gcc/gcc.spec
--- a/gcc/gcc.spec	Sat Aug 04 14:16:14 2012 +0200
+++ b/gcc/gcc.spec	Sat Aug 04 22:02:31 2012 +0200
@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_full         4.6.3
+%define       V_full         4.7.1
 %define       V_comp         %nil
 
 #   package information
@@ -36,7 +36,7 @@
 Group:        Compiler
 License:      GPL
 Version:      %{V_full}
-Release:      20120208
+Release:      20120800
 
 #   package options
 %option       with_binutils  yes
@@ -56,19 +56,12 @@
 %endif
 
 #   list of sources
-Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-core-%{V_full}.tar.bz2
-Source1:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-g++-%{V_full}.tar.bz2
-Source2:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-objc-%{V_full}.tar.bz2
-Source3:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-java-%{V_full}.tar.bz2
-Source4:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-fortran-%{V_full}.tar.bz2
+Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-%{V_full}.tar.bz2
 Patch0:       gcc.patch
-Patch1:       gcc.patch.spawn
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make
+PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  mpc, mpfr, gmp
 PreReq:       mpc, mpfr, gmp
 %if "%{with_binutils}" == "yes"
@@ -83,8 +76,6 @@
 BuildPreReq:  zlib, infozip
 PreReq:       zlib
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     The GNU Compiler Collection (GCC) provides standard conforming and
@@ -97,25 +88,12 @@
         url       = ftp://gcc.gnu.org/pub/gcc/releases/
         regex     = gcc-(4\.\d+\.\d+)
         url       = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
-        regex     = gcc-core-(\d+\.\d+\.\d+)\.tar\.bz2
+        regex     = gcc-(\d+\.\d+\.\d+)\.tar\.bz2
     }
 
 %prep
     %setup -q
-%if "%{with_cxx}" == "yes"
-    %setup -q -T -D -b 1
-%endif
-%if "%{with_objc}" == "yes"
-    %setup -q -T -D -b 2
-%endif
-%if "%{with_java}" == "yes"
-    %setup -q -T -D -b 3
-%endif
-%if "%{with_fortran}" == "yes"
-    %setup -q -T -D -b 4
-%endif
     %patch -p0
-    %patch -p0 -P 1
     %{l_shtool} subst \
         -e 's;\(instname="\$dir/\$name"\)i;\1;' \
         ltmain.sh
@@ -243,6 +221,7 @@
     #   platforms failing 'compare' make target (see prep as well)
     case "%{l_platform -t}" in
         *i?86-sunos*  ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
+        *amd64-sunos* ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
         *amd64-linux* ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
     esac