diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-08-07 04:03:02 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-08-07 04:03:02 +0000 |
| commit | 3eee3efaeb4fe14c516ca8b7fb904e49906f95e9 (patch) | |
| tree | 7c79fec5759271ff216468ed9be0e5d18af91748 | |
| parent | Sync with cvs-HEAD. (diff) | |
| download | rtems-3eee3efaeb4fe14c516ca8b7fb904e49906f95e9.tar.bz2 | |
Sync with cvs-HEAD.
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 3 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 13 |
3 files changed, 2 insertions, 16 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index ddba1ee194..fdedf95e63 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -53,7 +53,7 @@ %if %build_newlib --enable-newlib-io-c99-formats \ %endif - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 2349773f40..10d741fbf7 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -81,9 +81,6 @@ BuildRequires: zlib-devel BuildRequires: gcc-gnat BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@ %endif -%if %build_fortran -BuildRequires: gmp-devel -%endif %global _gcclibdir %{_prefix}/lib diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index f1691b2106..3eb3f5733f 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -87,21 +87,10 @@ rm -f dirs ; echo "%defattr(-,root,root,-)" >> dirs -%if "%{_prefix}" != "/usr" - echo "%dir %{_prefix}" >> dirs - echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" - echo "%dir %{_libexecdir}" >> dirs -%endif -%endif - echo "%dir %{_gcclibdir}/gcc" >> dirs - echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs - TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" for i in $multilibs; do case $i in - \.) echo "%dir ${TGTDIR}" >> dirs - ;; + \.) ;; # ignore, handled elsewhere *) echo "%dir ${TGTDIR}/$i" >> dirs ;; esac |