2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am, configure.ac,
	autotools/autoconf-rtems.spec.in, autotools/automake-rtems.spec.in,
	binutils/Makefile.am, binutils/base-binutils.add,
	binutils/binutils.add, binutils/mkspec.in,
	binutils/target-binutils.add,
	common/common.add.in,
	cpukit/Makefile.am,
	gcc3newlib/Makefile.am, gcc3newlib/base-g77.add,
	gcc3newlib/base-gcc.add, gcc3newlib/base-gcj.add,
	gcc3newlib/base-gnat.add, gcc3newlib/gccnewlib.add,
	gcc3newlib/mkspec.in, gcc3newlib/target-c++.add,
	gcc3newlib/target-g77.add, gcc3newlib/target-gcc.add,
	gcc3newlib/target-gcj.add, gcc3newlib/target-gnat.add,
	gcc3newlib/target-objc.add,
	gccnewlib/Makefile.am,
	gdb/Makefile.am,
	rtems/Makefile.am,
	rtemsdoc/Makefile.am:
	Merger from rtems-4-6-branch.
	* common/common.am: New.
This commit is contained in:
Ralf Corsepius
2003-09-02 16:41:50 +00:00
parent ac3786b4dc
commit 087a6c86f5
30 changed files with 218 additions and 146 deletions

View File

@@ -2,6 +2,7 @@
## $Id$
##
include $(top_srcdir)/common/common.am
MKBINUTILSSPEC = $(SHELL) ./mkspec
@@ -13,61 +14,67 @@ SUBPACKAGES += base-binutils.add target-binutils.add
binutils.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES = binutils.spec.in
RPM_SPECS_DATA =
MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \
$(top_builddir)/setup.cache
arm-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
RPM_SPECS_DATA += arm-rtems-$(BINUTILSVERS).spec
c4x-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
RPM_SPECS_DATA += c4x-rtems-$(BINUTILSVERS).spec
h8300-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@
RPM_SPECS_DATA += h8300-rtems-$(BINUTILSVERS).spec
hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@
RPM_SPECS_DATA += hppa1.1-rtems-$(BINUTILSVERS).spec
i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@
RPM_SPECS_DATA += i386-rtems-$(BINUTILSVERS).spec
i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@
RPM_SPECS_DATA += i960-rtems-$(BINUTILSVERS).spec
m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@
RPM_SPECS_DATA += m68k-rtems-$(BINUTILSVERS).spec
mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@
RPM_SPECS_DATA += mips64orion-rtems-$(BINUTILSVERS).spec
mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@
RPM_SPECS_DATA += mips-rtems-$(BINUTILSVERS).spec
or32-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems > $@
RPM_SPECS_DATA += or32-rtems-$(BINUTILSVERS).spec
powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@
RPM_SPECS_DATA += powerpc-rtems-$(BINUTILSVERS).spec
sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@
RPM_SPECS_DATA += sh-rtems-$(BINUTILSVERS).spec
sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@
RPM_SPECS_DATA += sh-rtemself-$(BINUTILSVERS).spec
sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@
RPM_SPECS_DATA += sparc-rtems-$(BINUTILSVERS).spec
RPM_SPECS_DATA = \
arm-rtems-$(BINUTILSVERS).spec \
c4x-rtems-$(BINUTILSVERS).spec h8300-rtems-$(BINUTILSVERS).spec \
hppa1.1-rtems-$(BINUTILSVERS).spec \
i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec \
m68k-rtems-$(BINUTILSVERS).spec \
mips-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec \
or32-rtems-$(BINUTILSVERS).spec \
powerpc-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec \
sh-rtemself-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec
CLEANFILES += $(RPM_SPECS_DATA)
EXTRA_DIST = $(SUBPACKAGES)

View File

@@ -1,19 +1,18 @@
# ==============================================================
# rtems-base-binutils
# ==============================================================
%package -n rtems-base-binutils
Provides: rtems-base-binutils
%package -n %{rpmprefix}rtems-base-binutils
Summary: base package for rtems binutils
Group: rtems
Group: %{rpmgroup}
PreReq: /sbin/install-info
%description -n rtems-base-binutils
%description -n %{rpmprefix}rtems-base-binutils
RTEMS is an open source operating system for embedded systems.
This is the base for binutils regardless of target CPU.
%post -n rtems-base-binutils
%post -n %{rpmprefix}rtems-base-binutils
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -23,7 +22,7 @@ This is the base for binutils regardless of target CPU.
done
fi
%postun -n rtems-base-binutils
%postun -n %{rpmprefix}rtems-base-binutils
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -33,7 +32,7 @@ This is the base for binutils regardless of target CPU.
done
fi
%files -n rtems-base-binutils -f files
%files -n %{rpmprefix}rtems-base-binutils -f files
%defattr(-,root,root)
%dir %{_prefix}/info
%doc %{_prefix}/info/dir
@@ -42,7 +41,6 @@ This is the base for binutils regardless of target CPU.
%doc %{_prefix}/info/binutils.info.gz
%doc %{_prefix}/info/ld.info.gz
%if "%{binutils_version}" < "2.14"
# binutils >= 2.14 ships monolytic infos.
%doc %{_prefix}/info/as.info-*.gz
%doc %{_prefix}/info/bfd.info-?.gz
%doc %{_prefix}/info/binutils.info-?.gz

View File

@@ -1,9 +1,10 @@
%define binutils_version @binutils_version@
%define binutils_version @binutils_version@
%define binutils_target @target_alias@
Name: @target_alias@-binutils-collection
Summary: binutils for target @target_alias@
Group: rtems
Name: %{rpmprefix}%{binutils_target}-binutils-collection
Summary: binutils for target %{binutils_target}
Group: %{rpmgroup}
Release: @Release@
License: GPL/LGPL
@@ -37,8 +38,8 @@ RTEMS is an open source operating system for embedded systems.
This is binutils sources with patches for RTEMS.
%prep
# untar the sources inside @target_alias@-binutils
%setup -c -n @target_alias@-binutils
# untar the sources inside %{binutils_target}-binutils
%setup -c -n %{binutils_target}-binutils
@PATCH2@
test -d build || mkdir build
@@ -46,7 +47,7 @@ This is binutils sources with patches for RTEMS.
cd build
../binutils-%{binutils_version}/configure \
--build=%_build --host=%_host \
--target=@target_alias@ \
--target=%{binutils_target} \
--verbose --prefix=%{_prefix} --disable-nls
make all
@@ -62,7 +63,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%{_exeext}
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-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

View File

@@ -57,6 +57,8 @@ 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%@prefix\@%@prefix@%g" \
-e "s,@rpmprefix\@,@rpmprefix@,g" \
-e "s%@rpmgroup\@%@rpmgroup@%g" \
-e "s%@binutils_version\@%${binutils_version}%g" \
-e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
-e "s,@PATCH1\@,${PATCH1}," \

View File

@@ -1,49 +1,48 @@
# ==============================================================
# @target_alias@-binutils
# %{binutils_target}-binutils
# ==============================================================
%package -n @target_alias@-binutils
Provides: @target_alias@-binutils
Summary: rtems binutils for @target_alias@
Group: rtems
Requires: rtems-base-binutils
%package -n %{rpmprefix}%{binutils_target}-binutils
Summary: rtems binutils for %{binutils_target}
Group: %{rpmgroup}
Requires: %{rpmprefix}rtems-base-binutils
Autoreqprov: off
%description -n @target_alias@-binutils
%description -n %{rpmprefix}%{binutils_target}-binutils
RTEMS is an open source operating system for embedded systems.
This is the GNU binutils for RTEMS targetting @target_alias@.
This is the GNU binutils for RTEMS targetting %{binutils_target}.
%files -n @target_alias@-binutils
%files -n %{rpmprefix}%{binutils_target}-binutils
%defattr(-,root,root)
%doc %{_prefix}/man/man1/@target_alias@-*.1*
%doc %{_prefix}/man/man1/%{binutils_target}-*.1*
%dir %{_prefix}/bin
%{_prefix}/bin/@target_alias@-addr2line%{_exeext}
%{_prefix}/bin/@target_alias@-ar%{_exeext}
%{_prefix}/bin/@target_alias@-as%{_exeext}
%{_prefix}/bin/%{binutils_target}-addr2line%{_exeext}
%{_prefix}/bin/%{binutils_target}-ar%{_exeext}
%{_prefix}/bin/%{binutils_target}-as%{_exeext}
# c++filt now comes from gcc
# %{_prefix}/bin/@target_alias@-c++filt%{_exeext}
# %{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
# deleted as of 2.13
# %{_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}
# %{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
%{_prefix}/bin/%{binutils_target}-ld%{_exeext}
%{_prefix}/bin/%{binutils_target}-nm%{_exeext}
%{_prefix}/bin/%{binutils_target}-objcopy%{_exeext}
%{_prefix}/bin/%{binutils_target}-objdump%{_exeext}
%{_prefix}/bin/%{binutils_target}-ranlib%{_exeext}
%{_prefix}/bin/%{binutils_target}-readelf%{_exeext}
%{_prefix}/bin/%{binutils_target}-size%{_exeext}
%{_prefix}/bin/%{binutils_target}-strings%{_exeext}
%{_prefix}/bin/%{binutils_target}-strip%{_exeext}
%dir %{_prefix}/@target_alias@
%dir %{_prefix}/@target_alias@/bin
%{_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}/%{binutils_target}
%dir %{_prefix}/%{binutils_target}/bin
%{_prefix}/%{binutils_target}/bin/ar%{_exeext}
%{_prefix}/%{binutils_target}/bin/as%{_exeext}
%{_prefix}/%{binutils_target}/bin/ld%{_exeext}
%{_prefix}/%{binutils_target}/bin/nm%{_exeext}
%{_prefix}/%{binutils_target}/bin/ranlib%{_exeext}
%{_prefix}/%{binutils_target}/bin/strip%{_exeext}
%dir %{_prefix}/@target_alias@/lib
%{_prefix}/@target_alias@/lib/ldscripts
%dir %{_prefix}/%{binutils_target}/lib
%{_prefix}/%{binutils_target}/lib/ldscripts