2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.ac: Add AC_PREFIX_DEFAULT([/opt/rtems]).
	* mkbinutilsspec.in: Add propagation of @prefix@.
	* binutils/base-binutils.add:
	Let %post and %unpost apply %{_prefix}.
	Apply %{_prefix} instead of /opt/rtems.
	* binutils/binutils.add: Update copyright notice.
	Add _prefix.
	Apply %{_prefix} instead of /opt/rtems.
	Remove -a 0 in %setup.
 	Rework hack to SuSE's rpm screwing up %{_target}.
	Replace ARGS with CONFIGURE_ARGS.
	* binutils/target-binutils.add:
	Apply %{_prefix} instead of /opt/rtems.
This commit is contained in:
Joel Sherrill
2002-01-24 14:14:31 +00:00
parent 59bcc90fee
commit b96a7b14f9
5 changed files with 97 additions and 78 deletions

View File

@@ -1,3 +1,19 @@
2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add AC_PREFIX_DEFAULT([/opt/rtems]).
* mkbinutilsspec.in: Add propagation of @prefix@.
* binutils/base-binutils.add:
Let %post and %unpost apply %{_prefix}.
Apply %{_prefix} instead of /opt/rtems.
* binutils/binutils.add: Update copyright notice.
Add _prefix.
Apply %{_prefix} instead of /opt/rtems.
Remove -a 0 in %setup.
Rework hack to SuSE's rpm screwing up %{_target}.
Replace ARGS with CONFIGURE_ARGS.
* binutils/target-binutils.add:
Apply %{_prefix} instead of /opt/rtems.
2002-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Add initial support for building * binutils/binutils.add: Add initial support for building

View File

@@ -13,52 +13,52 @@ 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 rtems-base-binutils
if test -d $RPM_INSTALL_PREFIX/rtems/info; if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
test x"$f" != x"" && for i in $f; do test x"$f" != x"" && for i in $f; do
install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
done done
fi fi
%postun -n rtems-base-binutils %postun -n rtems-base-binutils
if test -d $RPM_INSTALL_PREFIX/rtems/info; if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
test x"$f" != x"" && for i in $f; do test x"$f" != x"" && for i in $f; do
install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
done done
fi fi
%files -n rtems-base-binutils -f files %files -n rtems-base-binutils -f files
%dir /opt/rtems/info %dir %{_prefix}/info
%doc /opt/rtems/info/dir %doc %{_prefix}/info/dir
%doc /opt/rtems/info/as.info.gz %doc %{_prefix}/info/as.info.gz
%doc /opt/rtems/info/as.info-?.gz %doc %{_prefix}/info/as.info-?.gz
%doc /opt/rtems/info/bfd.info.gz %doc %{_prefix}/info/bfd.info.gz
%doc /opt/rtems/info/bfd.info-?.gz %doc %{_prefix}/info/bfd.info-?.gz
%doc /opt/rtems/info/binutils.info.gz %doc %{_prefix}/info/binutils.info.gz
%doc /opt/rtems/info/binutils.info-?.gz %doc %{_prefix}/info/binutils.info-?.gz
%doc /opt/rtems/info/ld.info.gz %doc %{_prefix}/info/ld.info.gz
%doc /opt/rtems/info/ld.info-?.gz %doc %{_prefix}/info/ld.info-?.gz
%doc /opt/rtems/info/gasp.info.gz %doc %{_prefix}/info/gasp.info.gz
%doc /opt/rtems/info/standards.info.gz %doc %{_prefix}/info/standards.info.gz
%dir /opt/rtems/man %dir %{_prefix}/man
%dir /opt/rtems/man/man1 %dir %{_prefix}/man/man1
%dir /opt/rtems/include %dir %{_prefix}/include
/opt/rtems/include/bfd.h %{_prefix}/include/bfd.h
/opt/rtems/include/ansidecl.h %{_prefix}/include/ansidecl.h
/opt/rtems/include/bfdlink.h %{_prefix}/include/bfdlink.h
%dir /opt/rtems/lib %dir %{_prefix}/lib
/opt/rtems/lib/libbfd* %{_prefix}/lib/libbfd*
/opt/rtems/lib/libiberty* %{_prefix}/lib/libiberty*
/opt/rtems/lib/libopcodes* %{_prefix}/lib/libopcodes*
%dir /opt/rtems/share %dir %{_prefix}/share
%dir /opt/rtems/share/locale %dir %{_prefix}/share/locale

View File

@@ -1,11 +1,13 @@
# #
# spec file for binutils package targetting rtems # spec file for binutils package targetting rtems
# #
# Copyright (c) 1999,2000 OARCorp, Huntsville, AL # Copyright (c) 1999,2000,2002 OARCorp, Huntsville, AL
# #
# please send bugfixes or comments to joel@OARcorp.com # please send bugfixes or comments to joel@OARcorp.com
# #
%define _prefix @prefix@
Vendor: OAR Corporation Vendor: OAR Corporation
Distribution: Linux Distribution: Linux
Name: @target_alias@-binutils-collection Name: @target_alias@-binutils-collection
@@ -16,7 +18,7 @@ License: GPL/LGPL
Autoreqprov: off Autoreqprov: off
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
Prefix: /opt Prefix: %{_prefix}
BuildRoot: %{_tmppath}/@target_alias@-binutils BuildRoot: %{_tmppath}/@target_alias@-binutils
Version: @binutils_version@ Version: @binutils_version@
@@ -43,19 +45,20 @@ This is binutils sources with patches for RTEMS.
%prep %prep
# untar the sources inside @target_alias@-binutils # untar the sources inside @target_alias@-binutils
%setup -c -n @target_alias@-binutils -a 0 %setup -c -n @target_alias@-binutils
%patch0 -p0 %patch0 -p0
test -d build || mkdir build test -d build || mkdir build
%build %build
cd build # HACK: This should be %{target} != %{build}, but SuSE's rpm screws it.
# Ugly hack to work around a bug in SuSE's rpm %if "%{target_os}" != "%{build_os}"
%if "${_build_cpu}-%{_build_os}" != "%{_target_cpu}-%{_target_os}" CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
ARGS="--build=%{_build} --host=%{_target}"
%endif %endif
../binutils-@binutils_version@/configure $ARGS --target=@target_alias@ \
--verbose --prefix=/opt/rtems cd build
../binutils-@binutils_version@/configure ${CONFIGURE_ARGS} --target=@target_alias@ \
--verbose --prefix=%{_prefix}
make all make all
make info make info
@@ -63,31 +66,31 @@ This is binutils sources with patches for RTEMS.
%install %install
cd build cd build
make prefix=$RPM_BUILD_ROOT/opt/rtems install make prefix=$RPM_BUILD_ROOT%{_prefix} install
make prefix=$RPM_BUILD_ROOT/opt/rtems install-info make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
# A bug in binutils: binutils does not install share/locale # A bug in binutils: binutils does not install share/locale
# however it uses it # however it uses it
../binutils-@binutils_version@/mkinstalldirs \ ../binutils-@binutils_version@/mkinstalldirs \
$RPM_BUILD_ROOT/opt/rtems/share/locale $RPM_BUILD_ROOT%{_prefix}/share/locale
# gzip info files # gzip info files
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
if test -f $RPM_BUILD_ROOT/opt/rtems/info/configure.info.gz; if test -f $RPM_BUILD_ROOT%{_prefix}/info/configure.info.gz;
then then
# These are only present in binutils >= 2.9.5 # These are only present in binutils >= 2.9.5
find $RPM_BUILD_ROOT/opt/rtems/info -name 'configure.*' | \ find $RPM_BUILD_ROOT%{_prefix}/info -name 'configure.*' | \
sed -e "s,^$RPM_BUILD_ROOT,,g" > ../files sed -e "s,^$RPM_BUILD_ROOT,,g" > ../files
else else
touch ../files touch ../files
fi fi
# We assume that info/dir exists when building the RPMs # We assume that info/dir exists when building the RPMs
rm -f $RPM_BUILD_ROOT/opt/rtems/info/dir rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
f=`find $RPM_BUILD_ROOT/opt/rtems/info -name '*.info.gz'` f=`find $RPM_BUILD_ROOT%{_prefix}/info -name '*.info.gz'`
test x"$f" != x"" && for i in $f; do test x"$f" != x"" && for i in $f; do
install-info $i $RPM_BUILD_ROOT/opt/rtems/info/dir install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
done done
%clean %clean

View File

@@ -15,32 +15,32 @@ 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 @target_alias@.
%files -n @target_alias@-binutils %files -n @target_alias@-binutils
%doc /opt/rtems/man/man1/@target_alias@-*.1 %doc %{_prefix}/man/man1/@target_alias@-*.1
%dir /opt/rtems/bin %dir %{_prefix}/bin
/opt/rtems/bin/@target_alias@-addr2line@exe_ext@ %{_prefix}/bin/@target_alias@-addr2line@exe_ext@
/opt/rtems/bin/@target_alias@-ar@exe_ext@ %{_prefix}/bin/@target_alias@-ar@exe_ext@
/opt/rtems/bin/@target_alias@-as@exe_ext@ %{_prefix}/bin/@target_alias@-as@exe_ext@
/opt/rtems/bin/@target_alias@-c++filt@exe_ext@ %{_prefix}/bin/@target_alias@-c++filt@exe_ext@
/opt/rtems/bin/@target_alias@-gasp@exe_ext@ %{_prefix}/bin/@target_alias@-gasp@exe_ext@
/opt/rtems/bin/@target_alias@-ld@exe_ext@ %{_prefix}/bin/@target_alias@-ld@exe_ext@
/opt/rtems/bin/@target_alias@-nm@exe_ext@ %{_prefix}/bin/@target_alias@-nm@exe_ext@
/opt/rtems/bin/@target_alias@-objcopy@exe_ext@ %{_prefix}/bin/@target_alias@-objcopy@exe_ext@
/opt/rtems/bin/@target_alias@-objdump@exe_ext@ %{_prefix}/bin/@target_alias@-objdump@exe_ext@
/opt/rtems/bin/@target_alias@-ranlib@exe_ext@ %{_prefix}/bin/@target_alias@-ranlib@exe_ext@
/opt/rtems/bin/@target_alias@-readelf@exe_ext@ %{_prefix}/bin/@target_alias@-readelf@exe_ext@
/opt/rtems/bin/@target_alias@-size@exe_ext@ %{_prefix}/bin/@target_alias@-size@exe_ext@
/opt/rtems/bin/@target_alias@-strings@exe_ext@ %{_prefix}/bin/@target_alias@-strings@exe_ext@
/opt/rtems/bin/@target_alias@-strip@exe_ext@ %{_prefix}/bin/@target_alias@-strip@exe_ext@
%dir /opt/rtems/@target_alias@ %dir %{_prefix}/@target_alias@
%dir /opt/rtems/@target_alias@/bin %dir %{_prefix}/@target_alias@/bin
/opt/rtems/@target_alias@/bin/ar@exe_ext@ %{_prefix}/@target_alias@/bin/ar@exe_ext@
/opt/rtems/@target_alias@/bin/as@exe_ext@ %{_prefix}/@target_alias@/bin/as@exe_ext@
/opt/rtems/@target_alias@/bin/ld@exe_ext@ %{_prefix}/@target_alias@/bin/ld@exe_ext@
/opt/rtems/@target_alias@/bin/nm@exe_ext@ %{_prefix}/@target_alias@/bin/nm@exe_ext@
/opt/rtems/@target_alias@/bin/ranlib@exe_ext@ %{_prefix}/@target_alias@/bin/ranlib@exe_ext@
/opt/rtems/@target_alias@/bin/strip@exe_ext@ %{_prefix}/@target_alias@/bin/strip@exe_ext@
%dir /opt/rtems/@target_alias@/lib %dir %{_prefix}/@target_alias@/lib
/opt/rtems/@target_alias@/lib/ldscripts %{_prefix}/@target_alias@/lib/ldscripts

View File

@@ -3,7 +3,7 @@
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([binutils]) AC_CONFIG_SRCDIR([binutils])
AC_PREFIX_DEFAULT([/opt/rtems])
AM_INIT_AUTOMAKE(rtems-scripts,20010516,no) AM_INIT_AUTOMAKE(rtems-scripts,20010516,no)
AC_CANONICAL_HOST AC_CANONICAL_HOST