diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 03:40:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 03:40:26 +0000 |
| commit | 5ec10091d3a20bd434412e9d2c9cf4ae115bfe3b (patch) | |
| tree | cae385a0bdc33e2b7b9f3cc6d929d2f919397ce0 /contrib | |
| parent | Remove work-around to obsolete gfortran bug. (diff) | |
| download | rtems-5ec10091d3a20bd434412e9d2c9cf4ae115bfe3b.tar.bz2 | |
Install to --libdir=%{_prefix}/lib instead of %{_libdir}
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index 77d0257bde..e21ad755dd 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -37,7 +37,7 @@ --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index f5f9f97122..42b3cb2bcc 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -120,7 +120,7 @@ BuildRequires: gcc-gnat BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@ %endif -%define gcclib %{_libdir}/gcc +%define _gcclibdir %{_prefix}/lib @SOURCES@ diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index e29673a447..d115ae88c7 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -24,7 +24,13 @@ %endif # host library - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%if "%{gcc_version}" >= "4.3.0" + # libiberty doesn't honor --libdir, but always installs to _libdir + rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty install to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext} |