From 9bd1f4e5a7f62fb6cc9b53c706a6463c6bc04177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 25 Aug 2005 11:36:06 +0000 Subject: 2005-08-25 Ralf Corsepius * gccnewlib/gccnewlib.add: Remove vxaddr2line. Further minor cleanup. --- scripts/ChangeLog | 5 +++++ scripts/gccnewlib/gccnewlib.add | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index ab0162be10..079b2bc2fe 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2005-08-25 Ralf Corsepius + + * gccnewlib/gccnewlib.add: Remove vxaddr2line. + Further minor cleanup. + 2005-08-16 Ralf Corsepius * binutils/binutils.add: diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index cea1333d4b..5fc6e2fe4f 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -265,6 +265,11 @@ chmod +x brp-rtems-compress # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-c++filt%{_exeext} +%if %build_gnat + # Seemingly a VAX tool. Not meaningful for RTEMS + rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} +%endif + # We don't ship info/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir @@ -306,7 +311,9 @@ chmod +x brp-rtems-compress rm -f dirs ; echo "%defattr(-,root,root)" >> dirs - echo "%dir %{_prefix}/lib" >> dirs ; +%if "%{_prefix}" != "/usr" + echo "%dir %{_libdir}" >> dirs ; +%endif echo "%dir %{gcclib}" >> dirs ; echo "%dir %{gcclib}/%{gcc_target}" >> dirs ; -- cgit v1.2.3