2005-04-27 Ralf Corsepius <ralf.corsepius@rtems.org>

* gccnewlib/base-gfortran.add: Fix broken install-info.
	* gccnewlib/base-gnat.add, gccnewlib/target-gnat.add: Adaptations
	to gcc-4.0.0. Install infos using FC conventions.
This commit is contained in:
Ralf Corsepius
2005-04-27 11:28:34 +00:00
parent a514e785c5
commit f078d21961
4 changed files with 26 additions and 18 deletions

View File

@@ -1,3 +1,9 @@
2005-04-27 Ralf Corsepius <ralf.corsepius@rtems.org>
* gccnewlib/base-gfortran.add: Fix broken install-info.
* gccnewlib/base-gnat.add, gccnewlib/target-gnat.add: Adaptations
to gcc-4.0.0. Install infos using FC conventions.
2005-04-26 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-04-26 Ralf Corsepius <ralf.corsepius@rtems.org>
* autotools/automake-rtems.spec.in, * autotools/automake-rtems.spec.in,

View File

@@ -24,7 +24,7 @@ This is the files for gcc/gfortran that are shared by all targets.
%{_mandir}/man1/%{gcc_target}-gfortran.1* %{_mandir}/man1/%{gcc_target}-gfortran.1*
%post -n %{rpmprefix}rtems@osversion@-base-gfortran %post -n %{rpmprefix}rtems@osversion@-base-gfortran
/sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gfortran.info.gz /sbin/install-info --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
%postun -n %{rpmprefix}rtems@osversion@-base-gfortran %postun -n %{rpmprefix}rtems@osversion@-base-gfortran
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then

View File

@@ -6,6 +6,9 @@
Summary: gcc/gnat tools Summary: gcc/gnat tools
Group: %{rpmgroup} Group: %{rpmgroup}
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
%description -n %{rpmprefix}rtems@osversion@-base-gnat %description -n %{rpmprefix}rtems@osversion@-base-gnat
RTEMS is an open source operating system for embedded systems. RTEMS is an open source operating system for embedded systems.
@@ -13,7 +16,10 @@ This is the gcc/gnat tools for the gcc/gnat compiler
%files -n %{rpmprefix}rtems@osversion@-base-gnat %files -n %{rpmprefix}rtems@osversion@-base-gnat
%defattr(-,root,root) %defattr(-,root,root)
%if "%{gcc_version}" >= "4.0"
%dir %{_bindir} %dir %{_bindir}
%{_bindir}/vxaddr2line%{_exeext}
%endif
%if "%{gcc_version}" >= "3.3" %if "%{gcc_version}" >= "3.3"
%{_infodir}/gnat* %{_infodir}/gnat*
@@ -21,23 +27,15 @@ This is the gcc/gnat tools for the gcc/gnat compiler
%if "%{gcc_version}" >= "3.3" %if "%{gcc_version}" >= "3.3"
%post -n %{rpmprefix}rtems@osversion@-base-gnat %post -n %{rpmprefix}rtems@osversion@-base-gnat
if test -d %{_infodir}; /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
then /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
rm -f %{_infodir}/dir /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
f=`find %{_infodir} -name '*.info.gz'`
test -n "$f" && for i in $f; do
install-info $i %{_infodir}/dir
done
fi
%postun -n %{rpmprefix}rtems@osversion@-base-gnat %postun -n %{rpmprefix}rtems@osversion@-base-gnat
if test -d %{_infodir}; if [ $1 -eq 0 ]; then
then /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
rm -f %{_infodir}/dir /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
f=`find %{_infodir} -name '*.info.gz'` /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
test -n "$f" && for i in $f; do fi
install-info $i %{_infodir}/dir
done
fi
%endif %endif
%endif %endif

View File

@@ -17,7 +17,11 @@ This is the gcc/gnat compiler for %{gcc_target}
%dir %{_bindir} %dir %{_bindir}
%{_bindir}/%{gcc_target}-gnat* %{_bindir}/%{gcc_target}-gnat*
%{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext} %if "%{gcc_version}" >= "4.0"
%{_bindir}/%{gcc_target}-gprmake%{_exeext}
%endif
%{gccexec}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
%{gcclib}/%{gcc_target}/%{gcc_version}/adalib %{gcclib}/%{gcc_target}/%{gcc_version}/adalib
%{gcclib}/%{gcc_target}/%{gcc_version}/adainclude %{gcclib}/%{gcc_target}/%{gcc_version}/adainclude
%endif %endif