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: 21-Apr-2005 22:10:35
Branch: HEAD Handle: 2005042121103500
Modified files:
openpkg-src/gcc40 gcc40.spec
Log:
switch to release version and synchronize with gcc package
Summary:
Revision Changes Path
1.34 +15 -11 openpkg-src/gcc40/gcc40.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc40/gcc40.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 gcc40.spec
--- openpkg-src/gcc40/gcc40.spec 17 Apr 2005 08:14:50 -0000 1.33
+++ openpkg-src/gcc40/gcc40.spec 21 Apr 2005 20:10:35 -0000 1.34
@@ -25,9 +25,8 @@
# FIXME: rse: with_optimize=yes still broken
# package version
-%define V_full 4.0
+%define V_full 4.0.0
%define V_comp 40
-%define V_snap 20050416
# package information
Name: gcc40
@@ -39,8 +38,8 @@
Class: EVAL
Group: Compiler
License: GPL
-Version: %{V_full}s%{V_snap}
-Release: 20050417
+Version: %{V_full}
+Release: 20050421
# package options
%option with_cxx yes
@@ -54,7 +53,7 @@
%option with_gcc no
# list of sources
-Source0:
ftp://gcc.gnu.org/pub/gcc/snapshots/%{V_full}-%{V_snap}/gcc-%{V_full}-%{V_snap}.tar.bz2
+Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc40.patch
# build information
@@ -78,15 +77,15 @@
%track
prog gcc40 = {
- version = %{V_full}-%{V_snap}
- url = ftp://gcc.gnu.org/pub/gcc/snapshots/
- regex = (%{V_full}-\d{8})
- url = ftp://gcc.gnu.org/pub/gcc/snapshots/__NEWVER__/
- regex = gcc-(\d+\.\d+-\d{8})\.tar\.bz2
+ version = %{version}
+ url = ftp://gcc.gnu.org/pub/gcc/releases/
+ regex = (4(\.\d+\.)+)
+ url = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
+ regex = gcc-(__VER__)\.tar\.bz2
}
%prep
- %setup -q -n gcc-%{V_full}-%{V_snap}
+ %setup -q -n gcc-%{version}
%patch -p0
%{l_shtool} subst -v -s \
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
@@ -121,6 +120,11 @@
l_enable_threads="single"
%endif
+ # override threads setting for platforms with known limitations
+ case "%{l_platform -t}" in
+ *-netbsd1.6* ) l_enable_threads="single" ;;
+ esac
+
# determine language usage
l_enable_languages="c"
%if "%{with_cxx}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
