[rtems-crossrpms commit] Abandon gcc < 4.1.

Ralf Corsepius ralf at rtems.org
Thu May 8 11:05:00 UTC 2014


Module:    rtems-crossrpms
Branch:    master
Commit:    ef676deb179303a3bc441f56e52b67e9a4872b50
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=ef676deb179303a3bc441f56e52b67e9a4872b50

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Feb 10 15:41:11 2014 +0100

Abandon gcc < 4.1.

---

 gcc/base-gcj.add   |   14 --------------
 gcc/install.add    |    2 +-
 gcc/target-gcc.add |    4 +---
 gcc/target-gcj.add |    4 ----
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/gcc/base-gcj.add b/gcc/base-gcj.add
index fe8aed9..0218a66 100644
--- a/gcc/base-gcj.add
+++ b/gcc/base-gcj.add
@@ -27,20 +27,6 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %{_infodir}/gcj.info*
 %{_infodir}/fastjar.info*
 
-%if "%{gcc_version}" < "4.0"
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/gcjh.1*
-%{_mandir}/man1/jv-scan.1*
-%{_mandir}/man1/jcf-dump.1*
-%{_mandir}/man1/gij.1*
-%{_mandir}/man1/jv-convert.1*
-%{_mandir}/man1/rmic.1*
-%{_mandir}/man1/rmiregistry.1*
-%{_mandir}/man1/jar.1*
-%{_mandir}/man1/grepjar.1*
-%endif
-
 %post -n @rpmprefix at gcc-gcj-common
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
diff --git a/gcc/install.add b/gcc/install.add
index 52790ec..fc36228 100644
--- a/gcc/install.add
+++ b/gcc/install.add
@@ -2,7 +2,7 @@
 %if "%{_prefix}" != "/usr"
   export PATH="%{_bindir}:${PATH}"
 %endif
-  rm -rf $RPM_BUILD_ROOT
+  %{?el5:rm -rf $RPM_BUILD_ROOT}
 
   cd build
 
diff --git a/gcc/target-gcc.add b/gcc/target-gcc.add
index 7223db8..514d1e7 100644
--- a/gcc/target-gcc.add
+++ b/gcc/target-gcc.add
@@ -72,7 +72,7 @@ libgcc @tool_target at -gcc.
 %endif
 
 %files -n @rpmprefix@@tool_target at -gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
+%{?el5:%defattr(-,root,root)}
 %sysdir %{_prefix}
 %sysdir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
@@ -80,13 +80,11 @@ libgcc @tool_target at -gcc.
 %dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
 %dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
 
-%if "%{gcc_version}" > "4.0.3"
 %if "@tool_target@" != "bfin-rtems at rtems_api@"
 %if "@tool_target@" != "avr-rtems at rtems_api@"
 %dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp
 %endif
 %endif
-%endif
 
 %if "%{gcc_version}" >= "4.3.0"
 %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
diff --git a/gcc/target-gcj.add b/gcc/target-gcj.add
index 5111a06..a285c18 100644
--- a/gcc/target-gcj.add
+++ b/gcc/target-gcj.add
@@ -39,11 +39,7 @@ This is the gcc/java compiler for @tool_target@
 %{_mandir}/man1/@tool_target at -jcf-dump.1*
 %{_mandir}/man1/@tool_target at -gij.1*
 
-%if "%{gcc_version}" >= "4.0"
 %{_mandir}/man1/@tool_target at -grmi*.1*
-%else
-%{_mandir}/man1/@tool_target at -rmi*.1*
-%endif
 
 %sysdir %{_libexecdir}
 %dir %{_libexecdir}/gcc




More information about the vc mailing list