OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2004 23:48:40
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
Log:
apply the same version substs as in gcc35 here too in order to reduce
diff between gcc and gcc35
Summary:
Revision Changes Path
1.17 +0 -0 openpkg-src/gcc/gcc.patch
1.97 +0 -0 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 gcc.patch
--- openpkg-src/gcc/gcc.patch 26 Apr 2004 19:29:43 -0000 1.16
+++ openpkg-src/gcc/gcc.patch 25 Jun 2004 21:48:39 -0000 1.17
@@ -31,23 +31,6 @@
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
---- gcc/version.c.orig 2003-08-04 14:50:23.000000000 +0200
-+++ gcc/version.c 2003-09-27 15:01:39.000000000 +0200
-@@ -6,7 +6,7 @@
- please modify this string to indicate that, e.g. by putting your
- organization's name in parentheses at the end of the string. */
-
--const char version_string[] = "3.4.0";
-+const char version_string[] = "3.4.0 (@l_openpkg_release@)";
-
- /* This is the location of the online document giving instructions for
- reporting bugs. If you distribute a modified version of GCC,
-@@ -15,4 +15,4 @@
- forward us bugs reported to you, if you determine that they are
- not bugs in your modifications.) */
-
--const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
-+const char bug_report_url[] = "<URL:http://www.openpkg.org/>";
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 gcc.spec
--- openpkg-src/gcc/gcc.spec 8 Jun 2004 11:09:51 -0000 1.96
+++ openpkg-src/gcc/gcc.spec 25 Jun 2004 21:48:39 -0000 1.97
@@ -39,7 +39,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20040608
+Release: 20040625
# package options
%option with_cxx yes
@@ -102,7 +102,8 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
+ -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
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
