From 9c8ee7b2bdb94d4a5288203a448f685c700d50f0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 31 Jan 2003 05:32:20 +0000 Subject: 2003-01-31 Ralf Corsepius * gdb/gdb.add: Remove header, broken cdn-X configuration, %clean, Replace @exe_ext@ with %{_exeext}. * gdb/mkspec.in: Remove exe_ext. * gdb/target-gdb.add: Replace @exe_ext@ with %{_exeext}. * gdb/Makefile.am: Use $(top_builddir)/common/common.add, $(top_builddir)/common/clean.add, header.add. * gcc3newlib/base-gcj.add: Replace @exe_ext@ with %{_exeext}. * cpukit/mkspec.in: Remove exe_ext. * binutils/Makefile.am: Use $(top_builddir)/common/common.add, $(top_builddir)/common/clean.add, header.add. --- scripts/ChangeLog | 15 ++++++++++++++- scripts/binutils/Makefile.am | 6 ++++-- scripts/cpukit/mkspec.in | 2 -- scripts/gcc3newlib/base-gcj.add | 4 ++-- scripts/gdb/Makefile.am | 6 +++++- scripts/gdb/gdb.add | 21 ++------------------- scripts/gdb/mkspec.in | 2 -- scripts/gdb/target-gdb.add | 6 +++--- 8 files changed, 30 insertions(+), 32 deletions(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 0c55d979b0..41876560be 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,16 @@ +2003-01-31 Ralf Corsepius + + * gdb/gdb.add: Remove header, broken cdn-X configuration, + %clean, Replace @exe_ext@ with %{_exeext}. + * gdb/mkspec.in: Remove exe_ext. + * gdb/target-gdb.add: Replace @exe_ext@ with %{_exeext}. + * gdb/Makefile.am: Use $(top_builddir)/common/common.add, + $(top_builddir)/common/clean.add, header.add. + * gcc3newlib/base-gcj.add: Replace @exe_ext@ with %{_exeext}. + * cpukit/mkspec.in: Remove exe_ext. + * binutils/Makefile.am: Use $(top_builddir)/common/common.add, + $(top_builddir)/common/clean.add, header.add. + 2003-01-31 Ralf Corsepius * gcc3newlib/gccnewlib.add: Remove header, broken cdn-X configuration, @@ -9,7 +22,7 @@ * gcc3newlib/target-gcj.add: Replace @exe_ext@ with %{_exeext}. * gcc3newlib/target-gnat.add: Replace @exe_ext@ with %{_exeext}. * gcc3newlib/target-objc.add: Replace @exe_ext@ with %{_exeext}. - + gcc3newlib/Makefile.am: Use $(top_builddir)/common/common.add, + * gcc3newlib/Makefile.am: Use $(top_builddir)/common/common.add, $(top_builddir)/common/clean.add, header.add. 2003-01-31 Ralf Corsepius diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am index ba9eeed60c..3f1a156947 100644 --- a/scripts/binutils/Makefile.am +++ b/scripts/binutils/Makefile.am @@ -5,8 +5,10 @@ MKBINUTILSSPEC = $(SHELL) ./mkspec -SUBPACKAGES = binutils.add \ - base-binutils.add target-binutils.add +SUBPACKAGES = header.add +SUBPACKAGES += $(top_builddir)/common/common.add binutils.add +SUBPACKAGES += $(top_builddir)./common/clean.add +SUBPACKAGES += base-binutils.add target-binutils.add binutils.spec.in: $(SUBPACKAGES) cat $^ > $@ diff --git a/scripts/cpukit/mkspec.in b/scripts/cpukit/mkspec.in index 01add5830e..9d43ebf503 100644 --- a/scripts/cpukit/mkspec.in +++ b/scripts/cpukit/mkspec.in @@ -6,7 +6,6 @@ RPM_VERSION=`echo ${RTEMS_VERSION} | tr - _` CFG=../setup.cache dst=@RPM_SPECSdir@ -exe_ext=@EXEEXT@ usage() { @@ -52,5 +51,4 @@ sed -e "s%@Release\@%${rtems_rpm_release}%g" \ -e "s%@rpm_version\@%${RPM_VERSION}%g" \ -e "s,@rpm_build_root\@,${rpm_build_root},g" \ -e "s%@target_alias\@%${target_alias}%g" \ - -e "s%@exe_ext\@%${exe_ext}%g" \ < ${RTEMS_DIR}/cpukit/rtems-cpukit.spec.in diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add index 2362cadab1..ef0ecb9778 100644 --- a/scripts/gcc3newlib/base-gcj.add +++ b/scripts/gcc3newlib/base-gcj.add @@ -16,8 +16,8 @@ This is the files for gcc/java (gcj) that are shared by all targets. %files -n rtems-base-gcj %defattr(-,root,root) %dir %{_prefix}/bin -%{_prefix}/bin/jar@exe_ext@ -%{_prefix}/bin/grepjar@exe_ext@ +%{_prefix}/bin/jar%{_exeext} +%{_prefix}/bin/grepjar%{_exeext} %dir %{_prefix}/info %doc %{_prefix}/info/gcj.info*.gz diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index 20b581b50d..a33bb87361 100644 --- a/scripts/gdb/Makefile.am +++ b/scripts/gdb/Makefile.am @@ -4,7 +4,11 @@ MKSPEC = $(SHELL) ./mkspec -SUBPACKAGES = gdb.add base-gdb.add target-gdb.add +SUBPACKAGES = header.add +SUBPACKAGES += $(top_builddir)/common/common.add +SUBPACKAGES += gdb.add +SUBPACKAGES += $(top_builddir)/common/clean.add +SUBPACKAGES += base-gdb.add target-gdb.add noinst_DATA = gdb.spec.in diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index 3e2ef9ec40..ae47d1e349 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -1,16 +1,3 @@ -# -# spec file for package rtems -# -# Copyright (c) 1999 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@-gdb-collection Release: @Release@ License: GPL/LGPL @@ -62,7 +49,8 @@ cd gdb-@gdb_version@ %build test -d build || mkdir build cd build - ../gdb-@gdb_version@/configure --target=@target_alias@ \ + ../gdb-@gdb_version@/configure \ + --target=@target_alias@ \ --verbose --prefix=%{_prefix} @extra_configure_arguments@ \ --disable-nls @@ -87,8 +75,3 @@ test -d build || mkdir build gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null - -%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/gdb/mkspec.in b/scripts/gdb/mkspec.in index e3b17339ac..bb4e85204d 100644 --- a/scripts/gdb/mkspec.in +++ b/scripts/gdb/mkspec.in @@ -6,7 +6,6 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@ CFG=../setup.cache -exe_ext=@EXEEXT@ specsrc=${RTEMS_DIR}/gdb/gdb.spec.in @@ -72,5 +71,4 @@ sed -e "s%@Release\@%${gdb_rpm_release}%g" \ -e "s%@gdb_version\@%${gdb_version}%g" \ -e "s%@gdb_patch_version\@%${gdb_patch_version}%g" \ -e "s%@extra_configure_arguments\@%${extra_configure_arguments}%g" \ - -e "s%@exe_ext\@%${exe_ext}%g" \ < ${specsrc} diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add index 294fbd1d9e..7d3de235f4 100644 --- a/scripts/gdb/target-gdb.add +++ b/scripts/gdb/target-gdb.add @@ -20,8 +20,8 @@ This is the GNU gdb for RTEMS targetting @target_alias@. %doc %{_prefix}/man/man1/@target_alias@-run.1* %dir %{_prefix}/bin -%{_prefix}/bin/@target_alias@-gdb@exe_ext@ -%{_prefix}/bin/@target_alias@-run@exe_ext@ +%{_prefix}/bin/@target_alias@-gdb%{_exeext} +%{_prefix}/bin/@target_alias@-run%{_exeext} %if "@target_alias@" == "sparc-rtems" -%{_prefix}/bin/@target_alias@-sis@exe_ext@ +%{_prefix}/bin/@target_alias@-sis%{_exeext} %endif -- cgit v1.2.3