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 openpkg-web Date: 22-Jul-2003 15:47:17
Branch: HEAD Handle: 2003072214471402
Added files:
openpkg-src/gcc2 gcc2.patch
Modified files:
openpkg-src/gcc2 gcc2.spec
openpkg-web news.txt
Removed files:
openpkg-src/gcc2 gcc-2.95.3.patch-freebsd gcc-2.95.3.patch-osf
Log:
get rid of versioned patch files and merge into single patch file
Summary:
Revision Changes Path
1.2 +0 -23 openpkg-src/gcc2/gcc-2.95.3.patch-freebsd
1.2 +0 -20 openpkg-src/gcc2/gcc-2.95.3.patch-osf
1.1 +43 -0 openpkg-src/gcc2/gcc2.patch
1.15 +4 -6 openpkg-src/gcc2/gcc2.spec
1.5721 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
rm -f openpkg-src/gcc2/gcc-2.95.3.patch-freebsd <<'@@ .'
Index: openpkg-src/gcc2/gcc-2.95.3.patch-freebsd
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/gcc2/gcc-2.95.3.patch-osf <<'@@ .'
Index: openpkg-src/gcc2/gcc-2.95.3.patch-osf
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc2/gcc2.patch
============================================================================
$ cvs diff -u -r0 -r1.1 gcc2.patch
--- /dev/null 2003-07-22 15:47:16.000000000 +0200
+++ gcc2.patch 2003-07-22 15:47:16.000000000 +0200
@@ -0,0 +1,43 @@
+--- libiberty/strerror.c.orig Sun Sep 2 13:52:50 2001
++++ libiberty/strerror.c Sun Sep 2 13:52:24 2001
+@@ -462,7 +462,9 @@
+
+ #else
+
++#ifndef __FreeBSD__
+ extern int sys_nerr;
++#endif
+ extern char *sys_errlist[];
+
+ #endif
+--- libiberty/strsignal.c.orig Sat May 16 01:42:42 1998
++++ libiberty/strsignal.c Mon Sep 3 08:59:59 2001
+@@ -243,7 +243,7 @@
+
+ #else
+
+-#ifdef NSIG
++#if defined(NSIG) && !defined(__FreeBSD__)
+ static int sys_nsig = NSIG;
+ #else
+ #ifdef _NSIG
+--- gcc/configure.old Wed May 23 15:05:36 2001
++++ gcc/configure Wed May 23 15:05:40 2001
+@@ -3092,7 +3092,7 @@
+ *-*-osf[23]*)
+ tm_file="${tm_file} alpha/osf.h alpha/osf2or3.h"
+ ;;
+- *-*-osf4*)
++ *-*-osf[45]*)
+ tm_file="${tm_file} alpha/osf.h"
+ # Some versions of OSF4 (specifically X4.0-9 296.7) have
+ # a broken tar, so we use cpio instead.
+@@ -3100,7 +3100,7 @@
+ ;;
+ esac
+ case $machine in
+- *-*-osf4.0[b-z] | *-*-osf4.[1-9]*)
++ *-*-osf4.0[b-z] | *-*-osf4.[1-9]* | *-*-osf5.* )
+ target_cpu_default=MASK_SUPPORT_ARCH
+ ;;
+ esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc2/gcc2.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 gcc2.spec
--- openpkg-src/gcc2/gcc2.spec 8 Jul 2003 14:39:37 -0000 1.14
+++ openpkg-src/gcc2/gcc2.spec 22 Jul 2003 13:47:16 -0000 1.15
@@ -33,12 +33,11 @@
Group: Language
License: GPL
Version: 2.95.3
-Release: 20030317
+Release: 20030722
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
-Patch0: gcc-2.95.3.patch-osf
-Patch1: gcc-2.95.3.patch-freebsd
+Patch0: gcc2.patch
# build information
Prefix: %{l_prefix}
@@ -55,11 +54,10 @@
%prep
%setup -q -n gcc-%{version}
- %patch0 -p0
- %patch1 -p0
+ %patch -p0
# fix --with-local-prefix in advance
find . -type f -print |\
- xargs %{l_shtool} subst -v -s -e "s;/gcc-lib;/gcc2-lib;g"
+ xargs %{l_shtool} subst -v -s -e "s;/gcc-lib;/gcc2-lib;g"
%build
# configure the package
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5720 -r1.5721 news.txt
--- openpkg-web/news.txt 22 Jul 2003 13:41:39 -0000 1.5720
+++ openpkg-web/news.txt 22 Jul 2003 13:47:14 -0000 1.5721
@@ -1,3 +1,4 @@
+22-Jul-2003: Upgraded package: P<gcc2-2.95.3-20030722>
22-Jul-2003: Upgraded package: P<perl56-5.6.1-20030722>
22-Jul-2003: Upgraded package: P<autoconf-2.57-20030722>
22-Jul-2003: Upgraded package: P<pgp-6.5.8-20030722>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
