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: 08-Aug-2003 16:17:33
Branch: HEAD Handle: 2003080815173201
Modified files:
openpkg-src/gcc34 gcc34.spec
openpkg-web news.txt
Log:
fix installation procedure
Summary:
Revision Changes Path
1.10 +8 -8 openpkg-src/gcc34/gcc34.spec
1.6091 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc34/gcc34.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 gcc34.spec
--- openpkg-src/gcc34/gcc34.spec 6 Aug 2003 19:36:38 -0000 1.9
+++ openpkg-src/gcc34/gcc34.spec 8 Aug 2003 14:17:33 -0000 1.10
@@ -38,7 +38,7 @@
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
-Release: 20030806
+Release: 20030808
# package options
%option with_cxx yes
@@ -122,7 +122,7 @@
--exec-prefix=%{l_prefix} \
--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 \
+ --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp} \
--enable-languages="${l_enable_languages}" \
--enable-threads="${l_enable_threads}" \
--disable-maintainer-mode \
@@ -130,9 +130,9 @@
--disable-nls \
${l_with_gnu_ld_as}
- # explicitly redirect remaining gcc-lib directories
+ # explicitly redirect remaining gcc library directories
%{l_shtool} subst -v -s \
- -e "s;/gcc-lib/;/gcc%{V_comp}-lib/;" \
+ -e "s;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;" \
`find . -name Makefile -type f -print`
# determine build flags
@@ -184,16 +184,16 @@
# cleanup installation tree
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/%{V_full}/
for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do
subdir=`echo "$multilib" | sed -e 's/;.*$//'`
[ ".$subdir" = .. ] && continue
mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/$subdir/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/%{V_full}/$subdir/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir
done
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/
\
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/%{V_full}/include/ \
>/dev/null 2>&1 || true
# strip installation tree
@@ -207,7 +207,7 @@
%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%{V_comp}-lib/${triple}/%{V_full}/${prog} \
+ strip
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/%{V_full}/${prog} \
>/dev/null 2>&1 || true
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6090 -r1.6091 news.txt
--- openpkg-web/news.txt 8 Aug 2003 14:17:17 -0000 1.6090
+++ openpkg-web/news.txt 8 Aug 2003 14:17:32 -0000 1.6091
@@ -1,3 +1,4 @@
+08-Aug-2003: Upgraded package: P<gcc34-3.4s20030806-20030808>
08-Aug-2003: Upgraded package: P<transfig-3.2.4-20030808>
08-Aug-2003: Upgraded package: P<gv-3.5.8-20030808>
08-Aug-2003: Upgraded package: P<tightvnc-1.2.9-20030808>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
