summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-01-31 04:58:01 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-01-31 04:58:01 +0000
commit0ac55c0c571ad7646af559f592724d7e26771174 (patch)
tree1f94ab1f2b0eec92d8132aaac4c6538b75912f4c /scripts
parent2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-0ac55c0c571ad7646af559f592724d7e26771174.tar.bz2
2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Remove header, broken cdn-X configuration, %clean. * binutils/mkspec.in: Remove exe_ext, build_alias, host_alias. * binutils/target-binutils.add: Replace @exe_ext@ with %{_exeext}.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog7
-rw-r--r--scripts/binutils/binutils.add27
-rw-r--r--scripts/binutils/mkspec.in4
-rw-r--r--scripts/binutils/target-binutils.add40
4 files changed, 30 insertions, 48 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ba683bf2ff..614e212391 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,12 @@
2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * binutils/binutils.add: Remove header, broken cdn-X configuration,
+ %clean.
+ * binutils/mkspec.in: Remove exe_ext, build_alias, host_alias.
+ * binutils/target-binutils.add: Replace @exe_ext@ with %{_exeext}.
+
+2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* gcc3newlib/header.add: New.
* gccnewlib/header.add: New.
* binutils/header.add: New.
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 21550d584f..7e187fd7e9 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -1,16 +1,3 @@
-#
-# spec file for binutils package targetting rtems
-#
-# Copyright (c) 1999,2000,2002 OARCorp, Huntsville, AL
-#
-# please send bugfixes or comments to joel@OARcorp.com
-#
-
-%define _prefix @prefix@
-%define _defaultbuildroot %{_tmppath}/%{name}-%{version}
-
-Vendor: OAR Corporation
-Distribution: Linux
Name: @target_alias@-binutils-collection
Summary: binutils for target @target_alias@
Group: rtems
@@ -54,12 +41,9 @@ This is binutils sources with patches for RTEMS.
test -d build || mkdir build
%build
-#%if "%{_target_os}" != "%{_build_os}"
-# CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
-#%endif
-
cd build
- ../binutils-@binutils_version@/configure ${CONFIGURE_ARGS} --target=@target_alias@ \
+ ../binutils-@binutils_version@/configure \
+ --target=@target_alias@ \
--verbose --prefix=%{_prefix} --disable-nls
make all
@@ -75,7 +59,7 @@ This is binutils sources with patches for RTEMS.
../binutils-@binutils_version@/mkinstalldirs \
$RPM_BUILD_ROOT%{_prefix}/share/locale
- rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt@exe_ext@
+ rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt%{_exeext}
# gzip info files
gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null
@@ -96,8 +80,3 @@ This is binutils sources with patches for RTEMS.
/sbin/install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
done
-%clean
-# let rpm --clean remove BuildRoot iif using the default BuildRoot
- test "$RPM_BUILD_ROOT" = "%{_defaultbuildroot}" && \
- rm -rf $RPM_BUILD_ROOT
-
diff --git a/scripts/binutils/mkspec.in b/scripts/binutils/mkspec.in
index 64d3207dd6..cf44605ca3 100644
--- a/scripts/binutils/mkspec.in
+++ b/scripts/binutils/mkspec.in
@@ -6,7 +6,6 @@
RTEMS_DIR=`dirname $0`/@top_srcdir@
CFG=../setup.cache
-exe_ext=@EXEEXT@
specsrc=${RTEMS_DIR}/binutils/binutils.spec.in
@@ -57,12 +56,9 @@ fi
sed -e "s%@Release\@%${binutils_rpm_release}%g" \
-e "s,@rpm_build_root\@,${rpm_build_root},g" \
-e "s%@target_alias\@%${target_alias}%g" \
- -e "s%@build_alias\@%@build_alias@%g" \
- -e "s%@host_alias\@%@host_alias@%g" \
-e "s%@prefix\@%@prefix@%g" \
-e "s%@binutils_version\@%${binutils_version}%g" \
-e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
- -e "s%@exe_ext\@%${exe_ext}%g" \
-e "s,@PATCH1\@,${PATCH1}," \
-e "s,@PATCH2\@,${PATCH2}," \
< ${specsrc}
diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add
index 286364c27c..6ab71ff328 100644
--- a/scripts/binutils/target-binutils.add
+++ b/scripts/binutils/target-binutils.add
@@ -19,31 +19,31 @@ This is the GNU binutils for RTEMS targetting @target_alias@.
%doc %{_prefix}/man/man1/@target_alias@-*.1*
%dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-addr2line@exe_ext@
-%{_prefix}/bin/@target_alias@-ar@exe_ext@
-%{_prefix}/bin/@target_alias@-as@exe_ext@
+%{_prefix}/bin/@target_alias@-addr2line%{_exeext}
+%{_prefix}/bin/@target_alias@-ar%{_exeext}
+%{_prefix}/bin/@target_alias@-as%{_exeext}
# c++filt now comes from gcc
-# %{_prefix}/bin/@target_alias@-c++filt@exe_ext@
+# %{_prefix}/bin/@target_alias@-c++filt%{_exeext}
# deleted as of 2.13
-# %{_prefix}/bin/@target_alias@-gasp@exe_ext@
-%{_prefix}/bin/@target_alias@-ld@exe_ext@
-%{_prefix}/bin/@target_alias@-nm@exe_ext@
-%{_prefix}/bin/@target_alias@-objcopy@exe_ext@
-%{_prefix}/bin/@target_alias@-objdump@exe_ext@
-%{_prefix}/bin/@target_alias@-ranlib@exe_ext@
-%{_prefix}/bin/@target_alias@-readelf@exe_ext@
-%{_prefix}/bin/@target_alias@-size@exe_ext@
-%{_prefix}/bin/@target_alias@-strings@exe_ext@
-%{_prefix}/bin/@target_alias@-strip@exe_ext@
+# %{_prefix}/bin/@target_alias@-gasp%{_exeext}
+%{_prefix}/bin/@target_alias@-ld%{_exeext}
+%{_prefix}/bin/@target_alias@-nm%{_exeext}
+%{_prefix}/bin/@target_alias@-objcopy%{_exeext}
+%{_prefix}/bin/@target_alias@-objdump%{_exeext}
+%{_prefix}/bin/@target_alias@-ranlib%{_exeext}
+%{_prefix}/bin/@target_alias@-readelf%{_exeext}
+%{_prefix}/bin/@target_alias@-size%{_exeext}
+%{_prefix}/bin/@target_alias@-strings%{_exeext}
+%{_prefix}/bin/@target_alias@-strip%{_exeext}
%dir %{_prefix}/@target_alias@
%dir %{_prefix}/@target_alias@/bin
-%{_prefix}/@target_alias@/bin/ar@exe_ext@
-%{_prefix}/@target_alias@/bin/as@exe_ext@
-%{_prefix}/@target_alias@/bin/ld@exe_ext@
-%{_prefix}/@target_alias@/bin/nm@exe_ext@
-%{_prefix}/@target_alias@/bin/ranlib@exe_ext@
-%{_prefix}/@target_alias@/bin/strip@exe_ext@
+%{_prefix}/@target_alias@/bin/ar%{_exeext}
+%{_prefix}/@target_alias@/bin/as%{_exeext}
+%{_prefix}/@target_alias@/bin/ld%{_exeext}
+%{_prefix}/@target_alias@/bin/nm%{_exeext}
+%{_prefix}/@target_alias@/bin/ranlib%{_exeext}
+%{_prefix}/@target_alias@/bin/strip%{_exeext}
%dir %{_prefix}/@target_alias@/lib
%{_prefix}/@target_alias@/lib/ldscripts