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 openpkg$ Date: 30-Dec-2002 18:56:17
Branch: HEAD Handle: 2002123017561502
Modified files:
openpkg-re/vcheck vc.gcc33
openpkg-src/gcc33 gcc33.spec
openpkg-web news.txt
Removed files:
openpkg-src/gcc33 gcc.patch gcc.sh
Log:
- switch to %option(s)
- upgrade to snapshot 2002-12-23
- activate version tracking again
- fix %install procedure
- merge in with_threads stuff from gcc package
- merge in -O0 stuff from gcc package
Summary:
Revision Changes Path
1.3 +5 -4 openpkg-re/vcheck/vc.gcc33
1.2 +0 -11 openpkg-src/gcc33/gcc.patch
1.2 +0 -62 openpkg-src/gcc33/gcc.sh
1.3 +28 -34 openpkg-src/gcc33/gcc33.spec
1.2441 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcc33
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.gcc33
--- openpkg-re/vcheck/vc.gcc33 19 Oct 2002 07:17:40 -0000 1.2
+++ openpkg-re/vcheck/vc.gcc33 30 Dec 2002 17:56:15 -0000 1.3
@@ -2,9 +2,10 @@
}
prog gcc33 = {
- disabled
- version = 0
- url = http://:pserver:[EMAIL PROTECTED]:/cvsroot/gcc
- regex = gcc_latest_snapshot
+ version = 20021223
+ url = ftp://gcc.gnu.org/pub/gcc/snapshots/
+ regex = (\d+-\d+-\d+)
+ url = ftp://gcc.gnu.org/pub/gcc/snapshots/__NEWVER__/
+ regex = gcc-(__VER__)\.tar\.bz2
}
@@ .
rm -f openpkg-src/gcc33/gcc.patch <<'@@ .'
Index: openpkg-src/gcc33/gcc.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/gcc33/gcc.sh <<'@@ .'
Index: openpkg-src/gcc33/gcc.sh
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc33/gcc33.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 gcc33.spec
--- openpkg-src/gcc33/gcc33.spec 20 Dec 2002 19:12:12 -0000 1.2
+++ openpkg-src/gcc33/gcc33.spec 30 Dec 2002 17:56:17 -0000 1.3
@@ -26,41 +26,35 @@
# package versions
%define V_major 3.3
%define V_short 33
-%define V_snap 20021014
+%define V_snap_comp 20021223
+%define V_snap_dash 2002-12-23
# 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
+%option with_cxx yes
+%option with_optimize yes
+%option with_binutils yes
+%option with_threads yes
# package information
Name: gcc33
-Summary: GNU Compiler Collection (VERSION 3.3 SNAPSHOT)
+Summary: GNU Compiler Collection (3.3)
URL: http://gcc.gnu.org/
Vendor: Free Software Foundation
Packager: The OpenPKG Project
Distribution: OpenPKG [CORE]
Group: Language
License: GPL
-Version: %{V_major}s%{V_snap}
-Release: 20021018
+Version: %{V_major}s%{V_snap_comp}
+Release: 20021230
# list of sources
-Source0: gcc-%{V_major}-snapshot-%{V_snap}.tar.bz2
-Source1: gcc.sh
-Patch0: gcc.patch
+Source0:
ftp://gcc.gnu.org/pub/gcc/snapshots/%{V_snap_dash}/gcc-%{V_snap_comp}.tar.bz2
# 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
@@ -72,14 +66,10 @@
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}'
+ %options -p13
%prep
- %setup -q -n gcc-%{V_major}-snapshot
- %patch -p0
+ %setup -q -n gcc-%{V_snap_comp}
%{l_shtool} subst -v -s \
-e "s;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g" \
gcc/configure
@@ -105,7 +95,11 @@
%else
--enable-languages="c" \
%endif
- --enable-threads \
+%if "%{with_threads}" == "yes"
+ --enable-threads=posix \
+%else
+ --enable-threads=single \
+%endif
--disable-maintainer-mode \
--disable-shared \
--disable-nls \
@@ -130,10 +124,10 @@
*-osf* ) l_boot_cflags="-O" ;;
esac
%else
- l_boot_cflags=""
+ l_boot_cflags="-O0"
l_cflags=""
- l_libcflags="-g"
- l_libcxxflags="-g"
+ l_libcflags="-g -O0"
+ l_libcxxflags="-g -O0"
%endif
%{l_make} %{l_mflags} \
MAKE="%{l_make} %{l_mflags}" \
@@ -202,14 +196,14 @@
done
# cleanup tree
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libiberty.a
- rm -f
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{version}/libstdc++.a
+ rm -f
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libstdc++.a
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libstdc++.a* \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{version}/libstdc++.a
- rm -f
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{version}/libsupc++.a
+
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libstdc++.a
+ rm -f
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libsupc++.a
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libsupc++.a* \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{version}/libsupc++.a
+
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libsupc++.a
# rename files
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
@@ -229,7 +223,7 @@
)
# create file list
- %{l_rpmtool} files -v -o$RPM_BUILD_DIR/gcc-%{V_major}-snapshot/files
-r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -o$RPM_BUILD_DIR/gcc-%{V_snap_comp}/files
-r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2440 -r1.2441 news.txt
--- openpkg-web/news.txt 30 Dec 2002 16:49:06 -0000 1.2440
+++ openpkg-web/news.txt 30 Dec 2002 17:56:16 -0000 1.2441
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<gcc33-3.3s20021223-20021230>
30-Dec-2002: Upgraded package: P<mutt-1.4i-20021230>
30-Dec-2002: Upgraded package: P<imagemagick-5.5.3.1-20021230>
30-Dec-2002: Upgraded package: P<ghostscript-8.00-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
