Browse Source

upgrading package: gcc 4.6.3 -> 4.7.1

master
parent
commit
546c11c142
  1. 69
      gcc/gcc.patch
  2. 24
      gcc/gcc.spec

69
gcc/gcc.patch

@ -1,6 +1,6 @@
Index: config.guess
--- config.guess.orig 2011-03-21 16:02:29.000000000 +0100
+++ config.guess 2011-11-19 09:08:18.000000000 +0100
--- 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'
;;
@ -10,31 +10,10 @@ Index: config.guess
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
Index: 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-11-19 09:08:18.000000000 +0100
@@ -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
--- gcc/config/i386/sol2.h.orig 2011-02-02 17:58:49.000000000 +0100
+++ gcc/config/i386/sol2.h 2011-11-19 09:08:18.000000000 +0100
@@ -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
@ -44,10 +23,22 @@ Index: gcc/config/i386/sol2.h
/* 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
--- gcc/config/sol2.h.orig 2011-07-15 11:39:41.000000000 +0200
+++ gcc/config/sol2.h 2011-11-19 09:30:13.000000000 +0100
@@ -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} \
@ -55,26 +46,26 @@ Index: gcc/config/sol2.h
- %{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
--- gcc/system.h.orig 2011-01-09 13:41:33.000000000 +0100
+++ gcc/system.h 2011-11-19 09:08:18.000000000 +0100
@@ -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
--- libcpp/charset.c.orig 2011-01-03 21:52:22.000000000 +0100
+++ libcpp/charset.c 2011-11-19 09:08:18.000000000 +0100
+++ 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)
@ -84,8 +75,8 @@ Index: libcpp/charset.c
#endif
Index: libcpp/internal.h
--- libcpp/internal.h.orig 2010-09-29 20:18:38.000000000 +0200
+++ libcpp/internal.h 2011-11-19 09:08:18.000000000 +0100
--- 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>

24
gcc/gcc.spec

@ -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 @@ Class: CORE
Group: Compiler
License: GPL
Version: %{V_full}
Release: 20120321
Release: 20120721
# package options
%option with_binutils yes
@ -50,11 +50,7 @@ Release: 20120321
%option with_multilib no
# 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
# build information
@ -86,23 +82,11 @@ PreReq: zlib
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
%{l_shtool} subst -v -s \
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \

Loading…
Cancel
Save