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: 27-Jul-2007 09:08:44
Branch: HEAD Handle: 2007072708084300
Modified files:
openpkg-src/gcc gcc.spec
Log:
move also lib64/ directories into gcc-specific lib/ directory (this
especially gets tid of the top-level lib64/ dir under amd64-linux)
Summary:
Revision Changes Path
1.148 +8 -1 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.147 -r1.148 gcc.spec
--- openpkg-src/gcc/gcc.spec 20 Jul 2007 18:37:26 -0000 1.147
+++ openpkg-src/gcc/gcc.spec 27 Jul 2007 07:08:43 -0000 1.148
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20070720
+Release: 20070727
# package options
%option with_cxx yes
@@ -247,6 +247,9 @@
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ \
>/dev/null 2>&1 || true
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib64/{lib*.a,*.spec} \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ \
+ >/dev/null 2>&1 || true
dirs=""
for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`;
do
subdir=`echo "$multilib" | sed -e 's/;.*$//'`
@@ -254,6 +257,9 @@
mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ \
>/dev/null 2>&1 || true
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib64/$subdir/lib*.a \
+
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ \
+ >/dev/null 2>&1 || true
dirs="$dirs $subdir"
done
for subdir in $dirs; do
@@ -268,6 +274,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
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}/lib64/*.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
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
