OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2005 15:34:43
Branch: HEAD Handle: 2005092014344300
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
Log:
Major Upgrade to GCC 4.0: gcc (3.4.4) becomes gcc3, gcc40 (4.0.1)
becomes gcc, gcc40 is removed, gcc41 is kept
Summary:
Revision Changes Path
1.23 +39 -26 openpkg-src/gcc/gcc.patch
1.116 +13 -11 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 gcc.patch
--- openpkg-src/gcc/gcc.patch 19 Sep 2005 20:07:28 -0000 1.22
+++ openpkg-src/gcc/gcc.patch 20 Sep 2005 13:34:43 -0000 1.23
@@ -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 @@
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 @@
%{!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 @@
%(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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.115 -r1.116 gcc.spec
--- openpkg-src/gcc/gcc.spec 20 Sep 2005 12:07:20 -0000 1.115
+++ openpkg-src/gcc/gcc.spec 20 Sep 2005 13:34:43 -0000 1.116
@@ -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 @@
%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 @@
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 @@
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 @@
-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 @@
%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 @@
%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 @@
# 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" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
