|
|
@@ -26,7 +26,7 @@
|
|
|
# package version
|
|
|
%define V_full 3.4
|
|
|
%define V_comp 34
|
|
|
-%define V_snap 20031217
|
|
|
+%define V_snap 20031224
|
|
|
|
|
|
# package information
|
|
|
Name: gcc34
|
|
|
@@ -38,7 +38,7 @@ Distribution: OpenPKG [EVAL]
|
|
|
Group: Compiler
|
|
|
License: GPL
|
|
|
Version: %{V_full}s%{V_snap}
|
|
|
-Release: 20031218
|
|
|
+Release: 20031225
|
|
|
|
|
|
# package options
|
|
|
%option with_cxx yes
|
|
|
@@ -185,16 +185,16 @@ Provides: gcc = %{version}-%{release}
|
|
|
|
|
|
# cleanup installation tree
|
|
|
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/%{V_full}/
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/
|
|
|
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}/${triple}/%{V_full}/$subdir/
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$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}/${triple}/%{V_full}/include/ \
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/ \
|
|
|
>/dev/null 2>&1 || true
|
|
|
|
|
|
# strip installation tree
|
|
|
@@ -208,7 +208,7 @@ Provides: gcc = %{version}-%{release}
|
|
|
%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}/${triple}/%{V_full}/${prog} \
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/${prog} \
|
|
|
>/dev/null 2>&1 || true
|
|
|
done
|
|
|
|
