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: 03-Jun-2003 12:11:10
Branch: HEAD Handle: 2003060311110702
Modified files:
openpkg-re/vcheck vc.gcc
openpkg-src/gcc gcc.spec
openpkg-web news.txt
Log:
upgrading package: gcc 3.2.3 -> 3.3
Summary:
Revision Changes Path
1.15 +2 -4 openpkg-re/vcheck/vc.gcc
1.53 +44 -14 openpkg-src/gcc/gcc.spec
1.4702 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcc
============================================================================
$ cvs diff -u -r1.14 -r1.15 vc.gcc
--- openpkg-re/vcheck/vc.gcc 28 May 2003 06:42:00 -0000 1.14
+++ openpkg-re/vcheck/vc.gcc 3 Jun 2003 10:11:07 -0000 1.15
@@ -2,16 +2,14 @@
}
prog gcc = {
- comment = "rse: do not upgrade gcc to anything above 3.2.x; use gcc33 for 3.3.x
- needs investigation for whole OpenPKG"
- version = 3.2.3
+ version = 3.3
url = ftp://gcc.gnu.org/pub/gcc/releases/
regex = ((\d+\.)+\d+)
url = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
regex = gcc-(__VER__)\.tar\.bz2
}
prog gcc:bounds = {
- comment = "rse: do not upgrade gcc to anything above 3.2.x; use gcc33 for 3.3.x
- needs investigation for whole OpenPKG"
- version = 3.2.3-1.01
+ version = 3.3-1.00
url = http://web.inter.nl.net/hcc/Haj.Ten.Brugge/
regex = bounds-checking-gcc-(__VER__).patch.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 gcc.spec
--- openpkg-src/gcc/gcc.spec 30 Apr 2003 13:19:44 -0000 1.52
+++ openpkg-src/gcc/gcc.spec 3 Jun 2003 10:11:09 -0000 1.53
@@ -23,6 +23,11 @@
## SUCH DAMAGE.
##
+# package version
+%define V_full 3.3
+%define V_comp %nil
+%define V_bounds 1.00
+
# package information
Name: gcc
Summary: GNU Compiler Collection
@@ -32,8 +37,8 @@
Distribution: OpenPKG [CORE]
Group: Language
License: GPL
-Version: 3.2.3
-Release: 20030430
+Version: %{V_full}
+Release: 20030603
# package options
%option with_cxx yes
@@ -41,11 +46,12 @@
%option with_binutils yes
%option with_threads yes
%option with_bounds no
+%option with_gcc no
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc.patch
-Patch1:
http://web.inter.nl.net/hcc/Haj.Ten.Brugge/bounds-checking-gcc-%{version}-1.01.patch.bz2
+Patch1:
http://web.inter.nl.net/hcc/Haj.Ten.Brugge/bounds-checking-gcc-%{version}-%{V_bounds}.patch.bz2
# build information
Prefix: %{l_prefix}
@@ -58,6 +64,9 @@
%endif
AutoReq: no
AutoReqProv: no
+%if "%{with_gcc}" == "yes"
+Provides: gcc = %{version}-%{release}
+%endif
%description
The GNU Compiler Collection (GCC) provides a standard conforming and
@@ -110,9 +119,9 @@
../configure \
--prefix=%{l_prefix} \
--exec-prefix=%{l_prefix} \
- --includedir=%{l_prefix}/include/gcc \
- --with-gxx-include-dir=%{l_prefix}/include/g++ \
- --with-local-prefix=%{l_prefix}/lib/gcc-lib \
+ --includedir=%{l_prefix}/include/gcc%{V_comp} \
+ --with-gxx-include-dir=%{l_prefix}/include/g++%{V_comp} \
+ --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp}-lib \
--enable-languages="${l_enable_languages}" \
--enable-threads="${l_enable_threads}" \
--disable-maintainer-mode \
@@ -120,6 +129,11 @@
--disable-nls \
${l_with_gnu_ld_as}
+ # explicitly redirect remaining gcc-lib directories
+ %{l_shtool} subst -v -s \
+ -e "s;/gcc-lib/;/gcc%{V_comp}-lib/;" \
+ `find . -name Makefile -type f -print`
+
# determine build flags
l_cflags=""
l_boot_cflags=""
@@ -171,23 +185,23 @@
# cleanup installation tree
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib/${triple}/%{version}/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib/${triple}/%{version}/include/ \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/
\
>/dev/null 2>&1 || true
# strip installation tree
rm -rf $RPM_BUILD_ROOT%{l_prefix}/${triple}
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man7 >/dev/null 2>&1 || true
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la >/dev/null 2>&1 || true
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man7 >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc* >/dev/null 2>&1 || true
%if "%{with_cxx}" == "yes"
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++ >/dev/null 2>&1 || true
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++ >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++ >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++ >/dev/null 2>&1 || true
%endif
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
for prog in cc1 cc1plus collect2 cpp; do
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib/${triple}/%{version}/${prog} \
+ strip
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/${prog} \
>/dev/null 2>&1 || true
done
@@ -199,6 +213,22 @@
%if "%{with_cxx}" == "yes"
ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/g++.1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/c++.1
+%endif
+
+ # resolve filename conflicts
+%if "%{with_gcc}" != "yes" && "%{V_comp}" != ""
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
+ for file in *; do
+ mv ${file} ${file}%{V_comp}
+ done )
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/info
+ for file in *; do
+ mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
+ done )
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ for file in *; do
+ mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
+ done )
%endif
# determine installation file list
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4701 -r1.4702 news.txt
--- openpkg-web/news.txt 3 Jun 2003 09:18:20 -0000 1.4701
+++ openpkg-web/news.txt 3 Jun 2003 10:11:08 -0000 1.4702
@@ -1,3 +1,4 @@
+03-Jun-2003: Upgraded package: P<gcc-3.3-20030603>
03-Jun-2003: Upgraded package: P<dia-0.91-20030603>
03-Jun-2003: Upgraded package: P<autogen-5.5.5-20030603>
03-Jun-2003: Upgraded package: P<vim-6.2.6-20030603>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
