<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-08-06)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-9-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Remove Obsoletes/Provides.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-c++.add.diff?r1=text&tr1=1.9.2.1&r2=text&tr2=1.9.2.2&diff_format=h">M</a></td><td width='1%'>1.9.2.2</td><td width='100%'>contrib/crossrpms/gcc/target-c++.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-gfortran.add.diff?r1=text&tr1=1.8.8.1&r2=text&tr2=1.8.8.2&diff_format=h">M</a></td><td width='1%'>1.8.8.2</td><td width='100%'>contrib/crossrpms/gcc/target-gfortran.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-objc.add.diff?r1=text&tr1=1.7&r2=text&tr2=1.7.8.1&diff_format=h">M</a></td><td width='1%'>1.7.8.1</td><td width='100%'>contrib/crossrpms/gcc/target-objc.add</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.1 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.1 Sat Feb 7 03:26:19 2009
+++ rtems/contrib/crossrpms/gcc/target-c++.add Sat Aug 6 00:13:08 2011
</font><font color='#997700'>@@ -11,8 +11,6 @@
</font> %if "%{_build}" != "%{_host}"
BuildRequires: @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
%endif
<font color='#880000'>-Provides: @rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes: @rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
</font>
%if %build_infos
Requires: @rpmprefix@gcc-common
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.1 rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.2
--- rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.1 Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/target-gfortran.add Sat Aug 6 00:13:08 2011
</font><font color='#997700'>@@ -8,14 +8,10 @@
</font> Version: %{gcc_rpmvers}
License: GPL
<font color='#880000'>-Provides: @rpmprefix@@tool_target@-gfortran = %{gcc_rpmvers}-%{release}
-Obsoletes: @rpmprefix@@tool_target@-gfortran < %{gcc_rpmvers}-%{release}
-
</font> %if %build_infos
Requires: @rpmprefix@gcc-gfortran-common
%endif
<font color='#880000'>-Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
-Obsoletes: @rpmprefix@@tool_target@-g77 < %{gcc_rpmvers}-%{release}
</font><font color='#000088'>+Requires: @rpmprefix@@tool_target@-gcc-libgfortran = %{gcc_rpmvers}-%{release}
</font>
%description -n @rpmprefix@@tool_target@-gcc-gfortran
GCC fortran compiler for @tool_target@.
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7 Sun Jul 23 09:19:14 2006
+++ rtems/contrib/crossrpms/gcc/target-objc.add Sat Aug 6 00:13:08 2011
</font><font color='#997700'>@@ -7,8 +7,6 @@
</font> Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
<font color='#880000'>-Provides: @rpmprefix@@tool_target@-objc = %{gcc_rpmvers}-%{release}
-Obsoletes: @rpmprefix@@tool_target@-objc < %{gcc_rpmvers}-%{release}
</font>
Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-9-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Abandon gcc-3.3/3.4
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/base-gcc.add.diff?r1=text&tr1=1.15&r2=text&tr2=1.15.2.1&diff_format=h">M</a></td><td width='1%'>1.15.2.1</td><td width='100%'>contrib/crossrpms/gcc/base-gcc.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/base-gcj.add.diff?r1=text&tr1=1.11&r2=text&tr2=1.11.4.1&diff_format=h">M</a></td><td width='1%'>1.11.4.1</td><td width='100%'>contrib/crossrpms/gcc/base-gcj.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/gccnewlib.add.diff?r1=text&tr1=1.25.2.2&r2=text&tr2=1.25.2.3&diff_format=h">M</a></td><td width='1%'>1.25.2.3</td><td width='100%'>contrib/crossrpms/gcc/gccnewlib.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/install.add.diff?r1=text&tr1=1.15.4.3&r2=text&tr2=1.15.4.4&diff_format=h">M</a></td><td width='1%'>1.15.4.4</td><td width='100%'>contrib/crossrpms/gcc/install.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-gcc.add.diff?r1=text&tr1=1.15.2.2&r2=text&tr2=1.15.2.3&diff_format=h">M</a></td><td width='1%'>1.15.2.3</td><td width='100%'>contrib/crossrpms/gcc/target-gcc.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-gcj.add.diff?r1=text&tr1=1.8&r2=text&tr2=1.8.8.1&diff_format=h">M</a></td><td width='1%'>1.8.8.1</td><td width='100%'>contrib/crossrpms/gcc/target-gcj.add</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/base-gcc.add:1.15 rtems/contrib/crossrpms/gcc/base-gcc.add:1.15.2.1
--- rtems/contrib/crossrpms/gcc/base-gcc.add:1.15 Fri Apr 25 10:19:47 2008
+++ rtems/contrib/crossrpms/gcc/base-gcc.add Sat Aug 6 00:25:40 2011
</font><font color='#997700'>@@ -22,16 +22,9 @@
</font> %{_infodir}/cppinternals.info*
%{_infodir}/gcc.info*
%{_infodir}/gccint.info*
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> %{_infodir}/gccinstall.info*
<font color='#880000'>-%endif
</font>
%sysdir %{_mandir}
<font color='#880000'>-%if "%{gcc_version}" < "3.4"
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
</font> %sysdir %{_mandir}/man7
%{_mandir}/man7/fsf-funding.7*
%{_mandir}/man7/gfdl.7*
<font color='#997700'>@@ -42,9 +35,7 @@
</font> /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
<font color='#880000'>-%endif
</font>
%preun -n @rpmprefix@gcc-common
if [ $1 -eq 0 ]; then
<font color='#997700'>@@ -52,9 +43,7 @@
</font> /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
<font color='#880000'>-%endif
</font> fi
%endif
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/base-gcj.add:1.11 rtems/contrib/crossrpms/gcc/base-gcj.add:1.11.4.1
--- rtems/contrib/crossrpms/gcc/base-gcj.add:1.11 Sun Jul 22 02:08:30 2007
+++ rtems/contrib/crossrpms/gcc/base-gcj.add Sat Aug 6 00:25:40 2011
</font><font color='#997700'>@@ -19,21 +19,13 @@
</font>
%files -n @rpmprefix@gcc-gcj-common
%defattr(-,root,root)
<font color='#880000'>-%if "%{gcc_version}" <= "3.4"
-%sysdir %{_bindir}
-%{_bindir}/jar%{_exeext}
-%{_bindir}/grepjar%{_exeext}
-%endif
</font>
%sysdir %{_infodir}
%ghost %{_infodir}/dir
%{_infodir}/gcj.info*
<font color='#880000'>-%if "%{gcc_version}" >= "3.3"
</font> %{_infodir}/fastjar.info*
<font color='#880000'>-%endif
</font>
%if "%{gcc_version}" < "4.0"
<font color='#880000'>-%if "%{gcc_version}" >= "3.3"
</font> %sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/gcjh.1*
<font color='#997700'>@@ -46,22 +38,15 @@
</font> %{_mandir}/man1/jar.1*
%{_mandir}/man1/grepjar.1*
%endif
<font color='#880000'>-%endif
</font>
%post -n @rpmprefix@gcc-gcj-common
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
<font color='#880000'>-
-%if "%{gcc_version}" >= "3.3"
- /sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-%endif
</font><font color='#000088'>+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
</font>
%preun -n @rpmprefix@gcc-gcj-common
if [ $1 -eq 0 ]; then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
<font color='#880000'>-
-%if "%{gcc_version}" >= "3.3"
- /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-%endif
</font><font color='#000088'>+/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
</font> fi
%endif
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.2 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.2 Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 00:33:39 2011
</font><font color='#997700'>@@ -80,7 +80,6 @@
</font> %endif
%if %build_gnat
# Building gnat requires gnat
<font color='#880000'>-# This really isn't available until RedHat 8.0. How to conditionalize this?
</font> BuildRequires: gcc-gnat
BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
%endif
<font color='#997700'>@@ -88,13 +87,8 @@
</font> BuildRequires: gmp-devel
%endif
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> %define gcclib %{_libdir}/gcc
%define gccexec %{_libexecdir}/gcc
<font color='#880000'>-%else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
-%endif
</font>
@SOURCES@
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.3 rtems/contrib/crossrpms/gcc/install.add:1.15.4.4
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.3 Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/install.add Sat Aug 6 00:25:40 2011
</font><font color='#997700'>@@ -51,17 +51,13 @@
</font> # mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran
%endif
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> # Bug in gcc-3.4.0pre
rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext}
<font color='#880000'>-%endif
</font>
<font color='#880000'>-%if "%{gcc_version}" >= "3.3"
</font> # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
# the fixinclude-install-tools
rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
<font color='#880000'>-%endif
</font>
# Bug in gcc > 4.1.0: Installs an unused, empty directory
if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.2 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.2 Sat Feb 7 03:26:19 2009
+++ rtems/contrib/crossrpms/gcc/target-gcc.add Sat Aug 6 00:25:41 2011
</font><font color='#997700'>@@ -21,17 +21,13 @@
</font> %sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-gcc.1*
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> %{_mandir}/man1/@tool_target@-cpp.1*
%{_mandir}/man1/@tool_target@-gcov.1*
<font color='#880000'>-%endif
</font>
%sysdir %{_bindir}
%{_bindir}/@tool_target@-cpp%{_exeext}
%{_bindir}/@tool_target@-gcc%{_exeext}
<font color='#880000'>-%if "%{gcc_version}" >= "3.3"
</font> %{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext}
<font color='#880000'>-%endif
</font> %{_bindir}/@tool_target@-gcov%{_exeext}
%{_bindir}/@tool_target@-gccbug
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-gcj.add:1.8 rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.1
--- rtems/contrib/crossrpms/gcc/target-gcj.add:1.8 Sun Jul 23 09:18:56 2006
+++ rtems/contrib/crossrpms/gcc/target-gcj.add Sat Aug 6 00:25:41 2011
</font><font color='#997700'>@@ -25,8 +25,6 @@
</font> %{_bindir}/@tool_target@-jcf-dump%{_exeext}
%{_bindir}/@tool_target@-jv-scan%{_exeext}
%{_bindir}/@tool_target@-gcjh%{_exeext}
<font color='#880000'>-
-%if "%{gcc_version}" >= "3.4"
</font> %{_bindir}/@tool_target@-*jar%{_exeext}
%{_mandir}/man1/@tool_target@-*jar.1*
<font color='#997700'>@@ -34,15 +32,12 @@
</font> %{_mandir}/man1/@tool_target@-jv-*.1*
%{_mandir}/man1/@tool_target@-jcf-dump.1*
%{_mandir}/man1/@tool_target@-gij.1*
<font color='#880000'>-%endif
</font>
%if "%{gcc_version}" >= "4.0"
%{_mandir}/man1/@tool_target@-grmi*.1*
%else
<font color='#880000'>-%if "%{gcc_version}" >= "3.4"
</font> %{_mandir}/man1/@tool_target@-rmi*.1*
%endif
<font color='#880000'>-%endif
</font>
%dir %{gccexec}
%dir %{gccexec}/@tool_target@
<font color='#997700'>@@ -51,4 +46,3 @@
</font> %{gccexec}/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
%endif
<font color='#880000'>-
</font></pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-9-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Eliminate gcclib.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/gccnewlib.add.diff?r1=text&tr1=1.25.2.3&r2=text&tr2=1.25.2.4&diff_format=h">M</a></td><td width='1%'>1.25.2.4</td><td width='100%'>contrib/crossrpms/gcc/gccnewlib.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/install.add.diff?r1=text&tr1=1.15.4.4&r2=text&tr2=1.15.4.5&diff_format=h">M</a></td><td width='1%'>1.15.4.5</td><td width='100%'>contrib/crossrpms/gcc/install.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/rpm-install.add.diff?r1=text&tr1=1.8.6.2&r2=text&tr2=1.8.6.3&diff_format=h">M</a></td><td width='1%'>1.8.6.3</td><td width='100%'>contrib/crossrpms/gcc/rpm-install.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-c++.add.diff?r1=text&tr1=1.9.2.2&r2=text&tr2=1.9.2.3&diff_format=h">M</a></td><td width='1%'>1.9.2.3</td><td width='100%'>contrib/crossrpms/gcc/target-c++.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-gcc.add.diff?r1=text&tr1=1.15.2.3&r2=text&tr2=1.15.2.4&diff_format=h">M</a></td><td width='1%'>1.15.2.4</td><td width='100%'>contrib/crossrpms/gcc/target-gcc.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-gnat.add.diff?r1=text&tr1=1.8&r2=text&tr2=1.8.8.1&diff_format=h">M</a></td><td width='1%'>1.8.8.1</td><td width='100%'>contrib/crossrpms/gcc/target-gnat.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/target-objc.add.diff?r1=text&tr1=1.7.8.1&r2=text&tr2=1.7.8.2&diff_format=h">M</a></td><td width='1%'>1.7.8.2</td><td width='100%'>contrib/crossrpms/gcc/target-objc.add</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.4
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3 Sat Aug 6 00:33:39 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 00:42:57 2011
</font><font color='#997700'>@@ -87,8 +87,8 @@
</font> BuildRequires: gmp-devel
%endif
<font color='#880000'>-%define gcclib %{_libdir}/gcc
</font> %define gccexec %{_libexecdir}/gcc
<font color='#000088'>+%global _gcclibdir %{_prefix}/lib
</font>
@SOURCES@
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.4 rtems/contrib/crossrpms/gcc/install.add:1.15.4.5
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.4 Sat Aug 6 00:25:40 2011
+++ rtems/contrib/crossrpms/gcc/install.add Sat Aug 6 00:42:57 2011
</font><font color='#997700'>@@ -19,7 +19,7 @@
</font> # Misplaced header file
if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
<font color='#880000'>- $RPM_BUILD_ROOT%{gcclib}/@tool_target@/%{gcc_version}/include/
</font><font color='#000088'>+ $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/
</font> fi
%endif
<font color='#997700'>@@ -56,7 +56,7 @@
</font>
# Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
# the fixinclude-install-tools
<font color='#880000'>- rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
</font><font color='#000088'>+ rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools
</font> rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
# Bug in gcc > 4.1.0: Installs an unused, empty directory
<font color='#997700'>@@ -89,10 +89,10 @@
</font> echo "%dir %{_libexecdir}" >> dirs
%endif
%endif
<font color='#880000'>- echo "%dir %{gcclib}" >> dirs
- echo "%dir %{gcclib}/@tool_target@" >> dirs
</font><font color='#000088'>+ echo "%dir %{_gcclibdir}/gcc" >> dirs
+ echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
</font>
<font color='#880000'>- TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
</font><font color='#000088'>+ TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
</font> for i in $f; do
case $i in
\.) echo "%dir ${TGTDIR}" >> dirs
<font color='#997700'>@@ -109,7 +109,7 @@
</font> cp dirs build/files.gcj
cp dirs build/files.g++
<font color='#880000'>- TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
</font><font color='#000088'>+ TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
</font> f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
for i in $f; do
case $i in
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.2 rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3
--- rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.2 Mon Nov 10 07:06:03 2008
+++ rtems/contrib/crossrpms/gcc/rpm-install.add Sat Aug 6 00:42:57 2011
</font><font color='#997700'>@@ -34,7 +34,7 @@
</font> cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
<font color='#880000'>- | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides
</font><font color='#000088'>+ | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides
</font> EOF
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
<font color='#997700'>@@ -42,7 +42,7 @@
</font> cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
<font color='#880000'>- | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires
</font><font color='#000088'>+ | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires
</font> EOF
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.3
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2 Sat Aug 6 00:13:08 2011
+++ rtems/contrib/crossrpms/gcc/target-c++.add Sat Aug 6 00:42:57 2011
</font><font color='#997700'>@@ -32,7 +32,7 @@
</font> %dir %{gccexec}/@tool_target@/%{gcc_version}
%{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
<font color='#880000'>-%dir %{gcclib}/@tool_target@/%{gcc_version}/include
-%{gcclib}/@tool_target@/%{gcc_version}/include/c++
</font><font color='#000088'>+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
</font> %endif
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.4
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3 Sat Aug 6 00:25:41 2011
+++ rtems/contrib/crossrpms/gcc/target-gcc.add Sat Aug 6 00:42:58 2011
</font><font color='#997700'>@@ -31,17 +31,17 @@
</font> %{_bindir}/@tool_target@-gcov%{_exeext}
%{_bindir}/@tool_target@-gccbug
<font color='#880000'>-%dir %{gcclib}/@tool_target@/%{gcc_version}/include
</font><font color='#000088'>+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
</font> %if "%{gcc_version}" > "4.0.3"
%if "@tool_target@" != "bfin-rtems@rtems_api@"
%if "@tool_target@" != "avr-rtems@rtems_api@"
<font color='#880000'>-%dir %{gcclib}/@tool_target@/%{gcc_version}/include/ssp
</font><font color='#000088'>+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp
</font> %endif
%endif
%endif
%if "%{gcc_version}" >= "4.3.0"
<font color='#880000'>-%dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed
</font><font color='#000088'>+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
</font> %endif
%dir %{gccexec}
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-gnat.add:1.8 rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.1
--- rtems/contrib/crossrpms/gcc/target-gnat.add:1.8 Sun Jul 23 09:18:39 2006
+++ rtems/contrib/crossrpms/gcc/target-gnat.add Sat Aug 6 00:42:58 2011
</font><font color='#997700'>@@ -29,7 +29,7 @@
</font> %dir %{gccexec}/@tool_target@/%{gcc_version}
%{gccexec}/@tool_target@/%{gcc_version}/gnat1%{_exeext}
<font color='#880000'>-%{gcclib}/@tool_target@/%{gcc_version}/adalib
-%{gcclib}/@tool_target@/%{gcc_version}/adainclude
</font><font color='#000088'>+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
</font> %endif
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.2
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1 Sat Aug 6 00:13:08 2011
+++ rtems/contrib/crossrpms/gcc/target-objc.add Sat Aug 6 00:42:58 2011
</font><font color='#997700'>@@ -21,6 +21,6 @@
</font> %dir %{gccexec}/@tool_target@/%{gcc_version}
%{gccexec}/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
<font color='#880000'>-%{gcclib}/@tool_target@/%{gcc_version}/include/objc
</font><font color='#000088'>+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
</font> %endif
</pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-9-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Merger from CVS-HEAD.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/prep.add.diff?r1=text&tr1=1.5.2.2&r2=text&tr2=1.5.2.3&diff_format=h">M</a></td><td width='1%'>1.5.2.3</td><td width='100%'>contrib/crossrpms/gcc/prep.add</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/contrib/crossrpms/gcc/rpm-install.add.diff?r1=text&tr1=1.8.6.3&r2=text&tr2=1.8.6.4&diff_format=h">M</a></td><td width='1%'>1.8.6.4</td><td width='100%'>contrib/crossrpms/gcc/rpm-install.add</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/prep.add:1.5.2.2 rtems/contrib/crossrpms/gcc/prep.add:1.5.2.3
--- rtems/contrib/crossrpms/gcc/prep.add:1.5.2.2 Fri Nov 27 01:13:21 2009
+++ rtems/contrib/crossrpms/gcc/prep.add Sat Aug 6 00:46:25 2011
</font><font color='#997700'>@@ -2,11 +2,15 @@
</font> %setup -c -T -n %{name}-%{version}
%setup -q -T -D -n %{name}-%{version} -a0
<font color='#880000'>-%{?PATCH0:%patch0 -p0}
</font><font color='#000088'>+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
</font>
%if %build_cxx
%setup -q -T -D -n %{name}-%{version} -a1
<font color='#880000'>-%{?PATCH1:%patch1 -p0}
</font><font color='#000088'>+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
</font> %endif
%if %build_fortran
<font color='#006600'>diff -u rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3 rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.4
--- rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3 Sat Aug 6 00:42:57 2011
+++ rtems/contrib/crossrpms/gcc/rpm-install.add Sat Aug 6 00:47:22 2011
</font><font color='#997700'>@@ -34,7 +34,7 @@
</font> cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
<font color='#880000'>- | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides
</font><font color='#000088'>+ %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_provides
</font> EOF
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
<font color='#997700'>@@ -42,7 +42,7 @@
</font> cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
<font color='#880000'>- | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires
</font><font color='#000088'>+ %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_requires
</font> EOF
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>