diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-11-05 19:07:46 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-11-05 19:07:46 +0000 |
commit | 05c66cfe0f95c76396eb5de4e4130844ba46a75c (patch) | |
tree | c310cd28d8dbeae694fd19961dc1ab6e88ca687c /contrib/crossrpms/rtems4.10/powerpc | |
parent | Filter find-debuginfo.sh not to mistreat foreign binaries. (diff) | |
download | rtems-05c66cfe0f95c76396eb5de4e4130844ba46a75c.tar.bz2 |
Update.
Diffstat (limited to 'contrib/crossrpms/rtems4.10/powerpc')
3 files changed, 45 insertions, 7 deletions
diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am index 75b0f58a77..b447eec88f 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec index d8dd5ea833..0318d52f4b 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-powerpc-rtems4.10-binutils Summary: Binutils for target powerpc-rtems4.10 Group: Development/Tools Version: %{binutils_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/binutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -196,6 +196,7 @@ GNU binutils targetting powerpc-rtems4.10. %files -n rtems-4.10-powerpc-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/powerpc-rtems4.10-*.1* @@ -248,6 +249,7 @@ fi %files -n rtems-4.10-binutils-common %defattr(-,root,root) +%dir %{_prefix} %dir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/as.info* diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec index 74cac1cf02..e17f2ba0c3 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec @@ -3,9 +3,21 @@ # http://www.rtems.org/bugzilla # -%define _prefix /opt/rtems-4.10 -%define _infodir %{_prefix}/info -%define _mandir %{_prefix}/man +%define _prefix /opt/rtems-4.10 +%define _exec_prefix %{_prefix} +%define _bindir %{_exec_prefix}/bin +%define _sbindir %{_exec_prefix}/sbin +%define _libexecdir %{_exec_prefix}/libexec +%define _datarootdir %{_prefix}/share +%define _datadir %{_datarootdir} +%define _sysconfdir %{_prefix}/etc +%define _sharedstatedir %{_prefix}/com +%define _localstatedir %{_prefix}/var +%define _includedir %{_prefix}/include +%define _libdir %{_exec_prefix}/%{_lib} +%define _mandir %{_datarootdir}/man +%define _infodir %{_datarootdir}/info +%define _localedir %{_datarootdir}/locale %ifos cygwin cygwin32 mingw mingw32 %define _exeext .exe @@ -40,7 +52,7 @@ Summary: powerpc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 5%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -169,7 +181,8 @@ cd .. CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ %else - CC="%{__cc} ${RPM_OPT_FLAGS}" \ +# gcc is not ready to be compiled with -std=gnu99 + CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ %endif ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ @@ -374,6 +387,29 @@ EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires + +# Extract %%__debug_install_post into debug_install_post~ +cat << \EOF > debug_install_post~ +%__debug_install_post +EOF + +# Generate customized debug_install_post script +cat debug_install_post~ | while read a x y; do +case $a in +# Prevent find-debuginfo.sh* from trying to handle foreign binaries +*/find-debuginfo.sh) + b=$(basename $a) + sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b + chmod a+x $b + ;; +esac +done + +sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ +< debug_install_post~ > debug_install_post +%define __debug_install_post . ./debug_install_post + + %clean rm -rf $RPM_BUILD_ROOT |