summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-08-25 11:36:06 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-08-25 11:36:06 +0000
commit9bd1f4e5a7f62fb6cc9b53c706a6463c6bc04177 (patch)
tree95463b9b319674aa5fec3646b31d4367d9d7404a
parent2005-08-18 Karel Gardas <kgardas@objectsecurity.com> (diff)
downloadrtems-9bd1f4e5a7f62fb6cc9b53c706a6463c6bc04177.tar.bz2
2005-08-25 Ralf Corsepius <ralf.corsepius@rtems.org>
* gccnewlib/gccnewlib.add: Remove vxaddr2line. Further minor cleanup.
Diffstat (limited to '')
-rw-r--r--scripts/ChangeLog5
-rw-r--r--scripts/gccnewlib/gccnewlib.add9
2 files changed, 13 insertions, 1 deletions
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 <ralf.corsepius@rtems.org>
+
+ * gccnewlib/gccnewlib.add: Remove vxaddr2line.
+ Further minor cleanup.
+
2005-08-16 Ralf Corsepius <ralf.corsepius@rtems.org>
* 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 ;