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: 30-Dec-2002 15:57:08
Branch: HEAD Handle: 2002123014570701
Modified files:
openpkg-src/gcc gcc.spec
openpkg-web news.txt
Removed files:
openpkg-src/gcc gcc.sh
Log:
switch to %option(s) and remove dynamic default for binutils because
this makes trouble and is inconsistent anyway
Summary:
Revision Changes Path
1.3 +0 -62 openpkg-src/gcc/gcc.sh
1.39 +8 -21 openpkg-src/gcc/gcc.spec
1.2437 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
rm -f openpkg-src/gcc/gcc.sh <<'@@ .'
Index: openpkg-src/gcc/gcc.sh
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 gcc.spec
--- openpkg-src/gcc/gcc.spec 20 Dec 2002 19:12:12 -0000 1.38
+++ openpkg-src/gcc/gcc.spec 30 Dec 2002 14:57:08 -0000 1.39
@@ -29,18 +29,10 @@
%define V_long 3.2.1
# package options
-%ifndef with_cxx
-%define with_cxx yes
-%endif
-%ifndef with_optimize
-%define with_optimize yes
-%endif
-%ifndef with_binutils
-%define with_binutils %(if [ -f %{SOURCE gcc.sh} ]; then sh %{SOURCE gcc.sh}
require-binutils %{l_target}; else echo "no"; fi)
-%endif
-%ifndef with_threads
-%define with_threads yes
-%endif
+%option with_cxx yes
+%option with_optimize yes
+%option with_binutils yes
+%option with_threads yes
# package information
Name: gcc
@@ -52,18 +44,17 @@
Group: Language
License: GPL
Version: %{V_short}
-Release: 20021125
+Release: 20021230
# list of sources
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_long}/gcc-%{V_long}.tar.bz2
-Source1: gcc.sh
Patch0: gcc.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20021230, make
+PreReq: OpenPKG, openpkg >= 20021230
%if "%{with_binutils}" == "yes"
BuildPreReq: binutils >= 2.13
PreReq: binutils >= 2.13
@@ -75,11 +66,7 @@
The GNU Compiler Collection (GCC) provides a standard conforming and
highly portable ISO C and ISO C++ compiler.
- Options:
- --define 'with_cxx %{with_cxx}'
- --define 'with_optimize %{with_optimize}'
- --define 'with_binutils %{with_binutils}'
- --define 'with_threads %{with_threads}'
+ %options -p13
%prep
%setup -q -n gcc-%{V_long}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2436 -r1.2437 news.txt
--- openpkg-web/news.txt 30 Dec 2002 14:52:46 -0000 1.2436
+++ openpkg-web/news.txt 30 Dec 2002 14:57:07 -0000 1.2437
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<gcc-3.2.1-20021230>
30-Dec-2002: Upgraded package: P<fsl-1.0.6-20021230>
30-Dec-2002: Upgraded package: P<flex-2.5.4a-20021230>
30-Dec-2002: Upgraded package: P<emacs-21.2-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
