diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-30 10:21:40 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-30 10:21:40 +0000 |
commit | b601e1a44ee767bbcd2d14cf042023c8177675ba (patch) | |
tree | 1a99880a7128eee369e79c0ea8efbc1b7b78d477 /scripts | |
parent | 2003-01-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-b601e1a44ee767bbcd2d14cf042023c8177675ba.tar.bz2 |
2003-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/mkspec.in: New.
* binutils/.cvsignore: Add mkspec.
* mkbinutilspec.in: Remove.
* gdb/Makefile.am: Depend on mkspec.
* binutils/binutils.add: Add @exe_ext@ to c++filt.
Add %_defaultbuildroot.
* configure.ac: Reflect changes above.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ChangeLog | 10 | ||||
-rw-r--r-- | scripts/binutils/.cvsignore | 1 | ||||
-rw-r--r-- | scripts/binutils/binutils.add | 9 | ||||
-rw-r--r-- | scripts/binutils/mkspec.in (renamed from scripts/mkbinutilspec.in) | 22 | ||||
-rw-r--r-- | scripts/configure.ac | 2 | ||||
-rw-r--r-- | scripts/gdb/Makefile.am | 2 |
6 files changed, 28 insertions, 18 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 63a2a5867d..912330390d 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,13 @@ +2003-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * binutils/mkspec.in: New. + * binutils/.cvsignore: Add mkspec. + * mkbinutilspec.in: Remove. + * gdb/Makefile.am: Depend on mkspec. + * binutils/binutils.add: Add @exe_ext@ to c++filt. + Add %_defaultbuildroot. + * configure.ac: Reflect changes above. + 2003-01-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * gdb/.cvsignore: Add mkspec. diff --git a/scripts/binutils/.cvsignore b/scripts/binutils/.cvsignore index 7cd764d6df..75693ef12c 100644 --- a/scripts/binutils/.cvsignore +++ b/scripts/binutils/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in binutils.spec binutils.spec.in +mkspec diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 376f46d7e4..21550d584f 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -7,6 +7,7 @@ # %define _prefix @prefix@ +%define _defaultbuildroot %{_tmppath}/%{name}-%{version} Vendor: OAR Corporation Distribution: Linux @@ -16,10 +17,10 @@ Group: rtems Release: @Release@ License: GPL/LGPL -Autoreqprov: off +Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com Prefix: %{_prefix} -BuildRoot: %{_tmppath}/@target_alias@-binutils +BuildRoot: %{_defaultbuildroot} BuildPreReq: /sbin/install-info BuildPreReq: texinfo >= 4.2 @@ -74,7 +75,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 + rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt@exe_ext@ # 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 @@ -97,6 +98,6 @@ This is binutils sources with patches for RTEMS. %clean # let rpm --clean remove BuildRoot iif using the default BuildRoot - test "$RPM_BUILD_ROOT" = "%{_tmppath}/@target_alias@-binutils" && \ + test "$RPM_BUILD_ROOT" = "%{_defaultbuildroot}" && \ rm -rf $RPM_BUILD_ROOT diff --git a/scripts/mkbinutilspec.in b/scripts/binutils/mkspec.in index 3f7111d24f..64d3207dd6 100644 --- a/scripts/mkbinutilspec.in +++ b/scripts/binutils/mkspec.in @@ -1,20 +1,21 @@ #!/bin/sh # -# Usage: mkbinutilspec CPU +# Usage: mkspec CPU # RTEMS_DIR=`dirname $0`/@top_srcdir@ -CFG=setup.cache -dst=@RPM_SPECSdir@ +CFG=../setup.cache exe_ext=@EXEEXT@ +specsrc=${RTEMS_DIR}/binutils/binutils.spec.in + usage() { echo "$0 [options] <target_alias>" echo " options:" echo " -cfg <setup.cache>" - echo " -o <rpm-spec-dir>" + echo " -a <alternate specs.in>" exit 1 ; } @@ -25,9 +26,9 @@ case $1 in CFG=$1 shift ;; --o) +-a) shift - dst=$1 + specsrc=$1 shift ;; -*) @@ -48,8 +49,6 @@ target_alias=$1 . ./$CFG -specfile=${dst}/$target_alias-binutils-${binutils_version}.spec - if test -n "${binutils_patch_version}"; then PATCH1="Patch0: binutils-${binutils_version}-rtems-${binutils_patch_version}.diff" PATCH2="%patch0 -p0" @@ -58,13 +57,12 @@ 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}," \ -< ${RTEMS_DIR}/binutils/binutils.spec.in \ -> ${specfile} - -echo Generated ${specfile} +< ${specsrc} diff --git a/scripts/configure.ac b/scripts/configure.ac index 0842d054e6..00d2175444 100644 --- a/scripts/configure.ac +++ b/scripts/configure.ac @@ -93,7 +93,7 @@ rtemsdoc/Makefile AC_CONFIG_FILES([buildalltar],[chmod +x buildalltar]) AC_CONFIG_FILES([buildall],[chmod +x buildall]) AC_CONFIG_FILES([gdb/mkspec],[chmod +x gdb/mkspec]) -AC_CONFIG_FILES([mkbinutilspec],[chmod +x mkbinutilspec]) +AC_CONFIG_FILES([binutils/mkspec],[chmod +x binutils/mkspec]) AC_CONFIG_FILES([mkgccnewlibspec],[chmod +x mkgccnewlibspec]) AC_CONFIG_FILES([mkbspspec],[chmod +x mkbspspec]) AC_CONFIG_FILES([gcc3newlib/mkspec],[chmod +x gcc3newlib/mkspec]) diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index 7ab0826f5c..20b581b50d 100644 --- a/scripts/gdb/Makefile.am +++ b/scripts/gdb/Makefile.am @@ -12,7 +12,7 @@ gdb.spec.in: $(SUBPACKAGES) cat $^ > $@ CLEANFILES = gdb.spec.in -MKGDBSPEC_DEPS = $(top_builddir)/mkspec gdb.spec.in \ +MKGDBSPEC_DEPS = mkspec gdb.spec.in \ $(top_builddir)/setup.cache arm-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) |