diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-16 05:19:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-16 05:19:58 +0000 |
| commit | 6ae5406cf22afb862f408cfd71deb8bd979bbefc (patch) | |
| tree | e154f5328e6c91de14e09a2f09ba93e37b727c96 | |
| parent | Add fedora-16. (diff) | |
| download | rtems-6ae5406cf22afb862f408cfd71deb8bd979bbefc.tar.bz2 | |
Partial merger from CVS-HEAD.
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 8 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 3 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 5 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-gcc.add | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index fa5134627a..833034585e 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -19,9 +19,6 @@ %if %build_gnat languages="$languages,ada" %endif -%if %build_libgcj - optargs="--enable-libgcj" -%endif %if "%{_prefix}" != "/usr" export PATH="%{_bindir}:${PATH}" %endif @@ -58,7 +55,10 @@ %if %build_newlib --enable-newlib-io-c99-formats \ %endif - --enable-languages="$languages" $optargs +%if %build_libgcj + --enable-libgcj \ +%endif + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 0f885272c6..f6e38f6037 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man7 %endif + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext} diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index 2aa7a7756e..26da5192c0 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -45,8 +45,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %endif %if 0%{?_build_mpfr} diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index ad6117596d..afd3379873 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -46,7 +46,9 @@ libgcc @tool_target@-gcc. %{_bindir}/@tool_target@-gcc%{_exeext} %{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext} %{_bindir}/@tool_target@-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/@tool_target@-gccbug +%endif %sysdir %{_libexecdir} %dir %{_libexecdir}/gcc |