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

* binutils/Makefile.am: Minor cleanups.
	* binutils/binutils.add, binutils/base-binutils.add,
	binutils/target-binutils.add: Add support for %{rpmprefix},
	%{rpmgroup}. Use %{binutils_target} and %{binutils_version}.
	* binutils/mkspec.in:: Add support for @rpmprefix@, @rpmgroup@.
This commit is contained in:
Ralf Corsepius
2003-09-02 03:22:40 +00:00
parent 74734167e1
commit dfed1a0ccd
6 changed files with 76 additions and 58 deletions

View File

@@ -1,3 +1,11 @@
2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/Makefile.am: Minor cleanups.
* binutils/binutils.add, binutils/base-binutils.add,
binutils/target-binutils.add: Add support for %{rpmprefix},
%{rpmgroup}. Use %{binutils_target} and %{binutils_version}.
* binutils/mkspec.in:: Add support for @rpmprefix@, @rpmgroup@.
2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* common/commom.am: New. * common/commom.am: New.

View File

@@ -14,61 +14,67 @@ SUBPACKAGES += base-binutils.add target-binutils.add
binutils.spec.in: $(SUBPACKAGES) binutils.spec.in: $(SUBPACKAGES)
cat $^ > $@ cat $^ > $@
CLEANFILES = binutils.spec.in CLEANFILES = binutils.spec.in
RPM_SPECS_DATA =
MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \ MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \
$(top_builddir)/setup.cache $(top_builddir)/setup.cache
arm-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) arm-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
RPM_SPECS_DATA += arm-rtems-$(BINUTILSVERS).spec
c4x-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) c4x-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
RPM_SPECS_DATA += c4x-rtems-$(BINUTILSVERS).spec
h8300-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) h8300-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@
RPM_SPECS_DATA += h8300-rtems-$(BINUTILSVERS).spec
hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@
RPM_SPECS_DATA += hppa1.1-rtems-$(BINUTILSVERS).spec
i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@
RPM_SPECS_DATA += i386-rtems-$(BINUTILSVERS).spec
i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@
RPM_SPECS_DATA += i960-rtems-$(BINUTILSVERS).spec
m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@
RPM_SPECS_DATA += m68k-rtems-$(BINUTILSVERS).spec
mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@
RPM_SPECS_DATA += mips64orion-rtems-$(BINUTILSVERS).spec
mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@
RPM_SPECS_DATA += mips-rtems-$(BINUTILSVERS).spec
or32-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) or32-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems > $@
RPM_SPECS_DATA += or32-rtems-$(BINUTILSVERS).spec
powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@
RPM_SPECS_DATA += powerpc-rtems-$(BINUTILSVERS).spec
sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@
RPM_SPECS_DATA += sh-rtems-$(BINUTILSVERS).spec
sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@
RPM_SPECS_DATA += sh-rtemself-$(BINUTILSVERS).spec
sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@ $(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) CLEANFILES += $(RPM_SPECS_DATA)
EXTRA_DIST = $(SUBPACKAGES) EXTRA_DIST = $(SUBPACKAGES)

View File

@@ -1,19 +1,18 @@
# ============================================================== # ==============================================================
# rtems-base-binutils # rtems-base-binutils
# ============================================================== # ==============================================================
%package -n rtems-base-binutils %package -n %{rpmprefix}rtems-base-binutils
Provides: rtems-base-binutils
Summary: base package for rtems binutils Summary: base package for rtems binutils
Group: rtems Group: %{rpmgroup}
PreReq: /sbin/install-info 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. RTEMS is an open source operating system for embedded systems.
This is the base for binutils regardless of target CPU. 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; if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -23,7 +22,7 @@ This is the base for binutils regardless of target CPU.
done done
fi fi
%postun -n rtems-base-binutils %postun -n %{rpmprefix}rtems-base-binutils
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -33,7 +32,7 @@ This is the base for binutils regardless of target CPU.
done done
fi fi
%files -n rtems-base-binutils -f files %files -n %{rpmprefix}rtems-base-binutils -f files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_prefix}/info %dir %{_prefix}/info
%doc %{_prefix}/info/dir %doc %{_prefix}/info/dir

View File

@@ -1,6 +1,10 @@
Name: @target_alias@-binutils-collection
Summary: binutils for target @target_alias@ %define binutils_version @binutils_version@
Group: rtems %define binutils_target @target_alias@
Name: %{rpmprefix}%{binutils_target}-binutils-collection
Summary: binutils for target %{binutils_target}
Group: %{rpmgroup}
Release: @Release@ Release: @Release@
License: GPL/LGPL License: GPL/LGPL
@@ -34,8 +38,8 @@ RTEMS is an open source operating system for embedded systems.
This is binutils sources with patches for RTEMS. This is binutils sources with patches for RTEMS.
%prep %prep
# untar the sources inside @target_alias@-binutils # untar the sources inside %{binutils_target}-binutils
%setup -c -n @target_alias@-binutils %setup -c -n %{binutils_target}-binutils
@PATCH2@ @PATCH2@
test -d build || mkdir build test -d build || mkdir build
@@ -43,7 +47,7 @@ This is binutils sources with patches for RTEMS.
cd build cd build
../binutils-@binutils_version@/configure \ ../binutils-@binutils_version@/configure \
--build=%_build --host=%_host \ --build=%_build --host=%_host \
--target=@target_alias@ \ --target=%{binutils_target} \
--verbose --prefix=%{_prefix} --disable-nls --verbose --prefix=%{_prefix} --disable-nls
make all make all
@@ -59,7 +63,7 @@ This is binutils sources with patches for RTEMS.
../binutils-@binutils_version@/mkinstalldirs \ ../binutils-@binutils_version@/mkinstalldirs \
$RPM_BUILD_ROOT%{_prefix}/share/locale $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 info files
gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
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,@rpm_build_root\@,${rpm_build_root},g" \
-e "s%@target_alias\@%${target_alias}%g" \ -e "s%@target_alias\@%${target_alias}%g" \
-e "s%@prefix\@%@prefix@%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_version\@%${binutils_version}%g" \
-e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \ -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
-e "s,@PATCH1\@,${PATCH1}," \ -e "s,@PATCH1\@,${PATCH1}," \

View File

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