Changeset f078d21 in rtems

Timestamp:

Apr 27, 2005, 11:28:34 AM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

0329aae

Parents:

a514e78

Message:

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

• 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.

Location:

scripts

Files:

• ChangeLog (modified) (1 diff)
• gccnewlib/base-gfortran.add (modified) (1 diff)
• gccnewlib/base-gnat.add (modified) (3 diffs)
• gccnewlib/target-gnat.add (modified) (1 diff)

scripts/ChangeLog

@@ +1 @@
+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>
 

scripts/gccnewlib/base-gfortran.add

@@ -25 +25 @@
 
 %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

scripts/gccnewlib/base-gnat.add

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

scripts/gccnewlib/target-gnat.add

@@ -18 +18 @@
 %{_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}/adainclude