Browse Source

Major Upgrade to GCC 4.0: gcc (3.4.4) becomes gcc3, gcc40 (4.0.1) becomes gcc, gcc40 is removed, gcc41 is kept

master
parent
commit
56afb587d6
  1. 65
      gcc/gcc.patch
  2. 24
      gcc/gcc.spec
  3. 81
      gcc3/gcc3.patch
  4. 24
      gcc3/gcc3.spec

65
gcc/gcc.patch

@ -1,6 +1,6 @@
Index: config.guess
--- config.guess.orig 2004-02-22 15:44:23 +0100
+++ config.guess 2005-05-20 09:23:59 +0200
--- config.guess.orig 2004-11-16 01:57:00 +0100
+++ config.guess 2005-09-20 15:29:05 +0200
@@ -189,7 +189,7 @@
release='-gnu'
;;
@ -11,9 +11,9 @@ Index: config.guess
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
Index: gcc/config/alpha/osf.h
--- gcc/config/alpha/osf.h.orig 2004-07-17 23:18:49 +0200
+++ gcc/config/alpha/osf.h 2005-05-20 09:23:59 +0200
@@ -79,7 +79,7 @@
--- gcc/config/alpha/osf.h.orig 2003-12-12 02:19:23.000000000 +0100
+++ gcc/config/alpha/osf.h 2004-04-26 21:25:14.000000000 +0200
@@ -78,7 +78,7 @@
constructor and call-frame data structures are not accidentally
overridden. */
#define LINK_SPEC \
@ -23,30 +23,18 @@ Index: gcc/config/alpha/osf.h
%{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
Index: gcc/config/i386/sol2.h
--- gcc/config/i386/sol2.h.orig 2004-06-14 19:34:11 +0200
+++ gcc/config/i386/sol2.h 2005-05-20 09:23:59 +0200
@@ -79,3 +79,7 @@
fprintf ((FILE), "\n"); \
} \
} while (0)
+
--- gcc/config/i386/sol2.h.orig 2004-06-14 19:31:27 +0200
+++ gcc/config/i386/sol2.h 2004-06-21 09:53:21 +0200
@@ -78,6 +78,9 @@
#undef ASM_QUAD
#endif
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
+
Index: gcc/system.h
--- gcc/system.h.orig 2004-03-16 00:22:47 +0100
+++ gcc/system.h 2005-05-20 09:23:59 +0200
@@ -315,10 +315,6 @@
extern char *strstr (const char *, const char *);
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
/* The Solaris assembler wants a .local for non-exported aliases. */
#define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \
do { \
Index: gcc/config/sol2.h
--- gcc/config/sol2.h.orig 2004-07-17 23:18:56 +0200
+++ gcc/config/sol2.h 2005-09-19 22:01:15 +0200
@ -61,3 +49,28 @@ Index: gcc/config/sol2.h
%(link_arch) \
%{Qy:} %{!Qn:-Qy}"
Index: gcc/system.h
--- gcc/system.h.orig 2003-08-23 20:03:05.000000000 +0200
+++ gcc/system.h 2003-09-03 20:02:11.000000000 +0200
@@ -319,10 +319,6 @@
extern char *strstr (const char *, const char *);
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
Index: libcpp/internal.h
--- libcpp/internal.h.orig 2004-09-09 21:16:55 +0200
+++ libcpp/internal.h 2004-09-27 20:04:43 +0200
@@ -33,6 +33,7 @@
#if HAVE_ICONV
#include <iconv.h>
#else
+#undef HAVE_ICONV
#define HAVE_ICONV 0
typedef int iconv_t; /* dummy */
#endif

24
gcc/gcc.spec

@ -23,7 +23,7 @@
##
# package version
%define V_full 3.4.4
%define V_full 4.0.1
%define V_comp %nil
# package information
@ -43,7 +43,7 @@ Release: 20050920
%option with_cxx yes
%option with_objc no
%option with_java no
%option with_f77 no
%option with_fortran no
%option with_optimize yes
%option with_profile no
%option with_binutils yes
@ -63,6 +63,10 @@ PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
%endif
%if "%{with_fortran}" == "yes"
BuildPreReq: mpfr
PreReq: mpfr
%endif
%if "%{with_java}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@ -81,7 +85,7 @@ Provides: gcc = %{version}-%{release}
prog gcc = {
version = %{version}
url = ftp://gcc.gnu.org/pub/gcc/releases/
regex = (3(\.\d+)+)
regex = (4\.0(\.\d+)?)
url = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
regex = gcc-(__VER__)\.tar\.bz2
}
@ -96,6 +100,9 @@ Provides: gcc = %{version}-%{release}
-e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F "OpenPKG-%%s"});' \
-e 's;\(bug_report_url\[\] = "\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
%{l_shtool} subst -v -s \
-e 's;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;' \
`find . -name Makefile.in -type f -print`
case "%{l_platform -t}" in
amd64*-linux* )
%{l_shtool} subst \
@ -146,8 +153,8 @@ Provides: gcc = %{version}-%{release}
%if "%{with_java}" == "yes"
l_enable_languages="${l_enable_languages},java"
%endif
%if "%{with_f77}" == "yes"
l_enable_languages="${l_enable_languages},f77"
%if "%{with_fortran}" == "yes"
l_enable_languages="${l_enable_languages},f95"
%endif
# disable GNU iconv usage
@ -182,11 +189,6 @@ Provides: gcc = %{version}-%{release}
%endif
${l_with_gnu_ld_as}
# explicitly redirect remaining gcc library directories
%{l_shtool} subst -v -s \
-e "s;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;" \
`find . -name Makefile -type f -print`
# determine build flags
l_ccisgcc=no
if [ ".`(%{l_cc} -v; %{l_cc} --version) </dev/null 2>&1 | grep -i 'gcc'`" != . ]; then
@ -208,7 +210,7 @@ Provides: gcc = %{version}-%{release}
# conservatively optimize the generated program code
# (also _tune_ for particular CPUs, but _without_ requiring these CPUs!)
l_cflags="$l_cflags -O"
l_boot_cflags="$l_boot_cflags -O2 -fomit-frame-pointer -funroll-loops"
l_boot_cflags="$l_boot_cflags -O2 -fomit-frame-pointer"
case "%{l_platform -t}" in
*i?86-* ) l_boot_cflags="$l_boot_cflags -mtune=pentium3" ;;
*sun4u-* ) l_boot_cflags="$l_boot_cflags -mtune=v9" ;;

81
gcc40/gcc40.patch → gcc3/gcc3.patch

@ -1,34 +1,19 @@
Index: gcc/config/i386/sol2.h
--- gcc/config/i386/sol2.h.orig 2004-06-14 19:31:27 +0200
+++ gcc/config/i386/sol2.h 2004-06-21 09:53:21 +0200
@@ -78,6 +78,9 @@
#undef ASM_QUAD
#endif
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
+
/* The Solaris assembler wants a .local for non-exported aliases. */
#define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \
do { \
Index: gcc/system.h
--- gcc/system.h.orig 2003-08-23 20:03:05.000000000 +0200
+++ gcc/system.h 2003-09-03 20:02:11.000000000 +0200
@@ -319,10 +319,6 @@
extern char *strstr (const char *, const char *);
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
Index: config.guess
--- config.guess.orig 2004-02-22 15:44:23 +0100
+++ config.guess 2005-05-20 09:23:59 +0200
@@ -189,7 +189,7 @@
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
Index: gcc/config/alpha/osf.h
--- gcc/config/alpha/osf.h.orig 2003-12-12 02:19:23.000000000 +0100
+++ gcc/config/alpha/osf.h 2004-04-26 21:25:14.000000000 +0200
@@ -78,7 +78,7 @@
--- gcc/config/alpha/osf.h.orig 2004-07-17 23:18:49 +0200
+++ gcc/config/alpha/osf.h 2005-05-20 09:23:59 +0200
@@ -79,7 +79,7 @@
constructor and call-frame data structures are not accidentally
overridden. */
#define LINK_SPEC \
@ -37,17 +22,17 @@ Index: gcc/config/alpha/osf.h
%{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
%{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
Index: libcpp/internal.h
--- libcpp/internal.h.orig 2004-09-09 21:16:55 +0200
+++ libcpp/internal.h 2004-09-27 20:04:43 +0200
@@ -33,6 +33,7 @@
#if HAVE_ICONV
#include <iconv.h>
#else
+#undef HAVE_ICONV
#define HAVE_ICONV 0
typedef int iconv_t; /* dummy */
#endif
Index: gcc/config/i386/sol2.h
--- gcc/config/i386/sol2.h.orig 2004-06-14 19:34:11 +0200
+++ gcc/config/i386/sol2.h 2005-05-20 09:23:59 +0200
@@ -79,3 +79,7 @@
fprintf ((FILE), "\n"); \
} \
} while (0)
+
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
+
Index: gcc/config/sol2.h
--- gcc/config/sol2.h.orig 2004-07-17 23:18:56 +0200
+++ gcc/config/sol2.h 2005-09-19 22:01:15 +0200
@ -62,3 +47,17 @@ Index: gcc/config/sol2.h
%(link_arch) \
%{Qy:} %{!Qn:-Qy}"
Index: gcc/system.h
--- gcc/system.h.orig 2004-03-16 00:22:47 +0100
+++ gcc/system.h 2005-05-20 09:23:59 +0200
@@ -315,10 +315,6 @@
extern char *strstr (const char *, const char *);
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif

24
gcc40/gcc40.spec → gcc3/gcc3.spec

@ -1,5 +1,5 @@
##
## gcc40.spec -- OpenPKG RPM Package Specification
## gcc3.spec -- OpenPKG RPM Package Specification
## Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
## Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
##
@ -23,11 +23,11 @@
##
# package version
%define V_full 4.0.1
%define V_comp 401
%define V_full 3.4.4
%define V_comp 3
# package information
Name: gcc40
Name: gcc3
Summary: GNU Compiler Collection
URL: http://gcc.gnu.org/
Vendor: Free Software Foundation
@ -43,7 +43,7 @@ Release: 20050920
%option with_cxx yes
%option with_objc no
%option with_java no
%option with_fortran no
%option with_f77 no
%option with_optimize yes
%option with_profile no
%option with_binutils yes
@ -52,7 +52,7 @@ Release: 20050920
# list of sources
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc40.patch
Patch0: gcc3.patch
# build information
Prefix: %{l_prefix}
@ -63,10 +63,6 @@ PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
%endif
%if "%{with_fortran}" == "yes"
BuildPreReq: mpfr
PreReq: mpfr
%endif
%if "%{with_java}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@ -82,10 +78,10 @@ Provides: gcc = %{version}-%{release}
highly portable ISO C and ISO C++ compiler.
%track
prog gcc40 = {
prog gcc3 = {
version = %{version}
url = ftp://gcc.gnu.org/pub/gcc/releases/
regex = (4\.0(\.\d+)?)
regex = (3(\.\d+)+)
url = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
regex = gcc-(__VER__)\.tar\.bz2
}
@ -153,8 +149,8 @@ Provides: gcc = %{version}-%{release}
%if "%{with_java}" == "yes"
l_enable_languages="${l_enable_languages},java"
%endif
%if "%{with_fortran}" == "yes"
l_enable_languages="${l_enable_languages},f95"
%if "%{with_f77}" == "yes"
l_enable_languages="${l_enable_languages},f77"
%endif
# disable GNU iconv usage
Loading…
Cancel
Save