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: 28-May-2006 13:45:53
Branch: HEAD Handle: 2006052812455300
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
Log:
fix GCC branding; don't try to patch files if there is nothing to
patch; include a vendor program fix
Summary:
Revision Changes Path
1.28 +12 -0 openpkg-src/gcc/gcc.patch
1.127 +6 -4 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.27 -r1.28 gcc.patch
--- openpkg-src/gcc/gcc.patch 29 Sep 2005 15:53:21 -0000 1.27
+++ openpkg-src/gcc/gcc.patch 28 May 2006 11:45:53 -0000 1.28
@@ -86,3 +86,15 @@
#define HAVE_ICONV 0
typedef int iconv_t; /* dummy */
#endif
+Index: gcc/tree-object-size.c
+--- gcc/tree-object-size.c.orig 2005-07-03 18:11:42 +0200
++++ gcc/tree-object-size.c 2006-05-28 13:12:44 +0200
+@@ -595,7 +595,7 @@
+ {
+ unsigned HOST_WIDE_INT off = tree_low_cst (op1, 1);
+
+- bytes = compute_builtin_object_size (value, object_size_type);
++ bytes = compute_builtin_object_size (op0, object_size_type);
+ if (off > offset_limit)
+ bytes = unknown[object_size_type];
+ else if (off > bytes)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.126 -r1.127 gcc.spec
--- openpkg-src/gcc/gcc.spec 28 May 2006 09:40:42 -0000 1.126
+++ openpkg-src/gcc/gcc.spec 28 May 2006 11:45:53 -0000 1.127
@@ -97,12 +97,14 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"});' \
+ -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"})\2;' \
-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`
+ if [ ".%{V_comp}" != . ]; then
+ %{l_shtool} subst -v -s \
+ -e 's;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;' \
+ `find . -name Makefile.in -type f -print`
+ fi
case "%{l_platform -t}" in
amd64*-linux* )
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
