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 | |
parent | Filter find-debuginfo.sh not to mistreat foreign binaries. (diff) | |
download | rtems-05c66cfe0f95c76396eb5de4e4130844ba46a75c.tar.bz2 |
Update.
Diffstat (limited to 'contrib')
36 files changed, 540 insertions, 84 deletions
diff --git a/contrib/crossrpms/rtems4.10/arm/Makefile.am b/contrib/crossrpms/rtems4.10/arm/Makefile.am index 8d5f4611e0..6c04778cdc 100644 --- a/contrib/crossrpms/rtems4.10/arm/Makefile.am +++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec index fab1ebb588..6f5f7e96ef 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-arm-rtems4.10-binutils Summary: Binutils for target arm-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 arm-rtems4.10. %files -n rtems-4.10-arm-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/arm-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/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec index 6da63ae9ea..939373dd39 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-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: arm-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?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 diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am index 38283fc79f..cbba386404 100644 --- a/contrib/crossrpms/rtems4.10/avr/Makefile.am +++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec index 85bde8e8a0..bdb18306bd 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-avr-rtems4.10-binutils Summary: Binutils for target avr-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 avr-rtems4.10. %files -n rtems-4.10-avr-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/avr-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/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec index 2dc0e49e44..5dc495c0cd 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-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: avr-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -161,7 +173,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} \ @@ -366,6 +379,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 diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am index 7ff44963c4..39790f01b2 100644 --- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am +++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec index c5596590e1..2612318ee4 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-bfin-rtems4.10-binutils Summary: Binutils for target bfin-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 bfin-rtems4.10. %files -n rtems-4.10-bfin-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/bfin-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/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec index 23cb45b7ca..8aa2396dd2 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-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: bfin-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -161,7 +173,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} \ @@ -366,6 +379,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 diff --git a/contrib/crossrpms/rtems4.10/h8300/Makefile.am b/contrib/crossrpms/rtems4.10/h8300/Makefile.am index 0e6c292465..cd5277ad3b 100644 --- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am +++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec index e2a1e17c47..7719c89b90 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-h8300-rtems4.10-binutils Summary: Binutils for target h8300-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 h8300-rtems4.10. %files -n rtems-4.10-h8300-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/h8300-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/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec index 1b34a438ce..e010660d4f 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-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: h8300-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?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 diff --git a/contrib/crossrpms/rtems4.10/i386/Makefile.am b/contrib/crossrpms/rtems4.10/i386/Makefile.am index a880c87ff7..40937c2282 100644 --- a/contrib/crossrpms/rtems4.10/i386/Makefile.am +++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec index edbc562fdb..49151c5f3c 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-i386-rtems4.10-binutils Summary: Binutils for target i386-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 i386-rtems4.10. %files -n rtems-4.10-i386-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/i386-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/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec index d8b74e2fc9..1c733298e9 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-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: i386-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?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 diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am index fe73bb1547..4d1edd41ad 100644 --- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 6%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --disable-infos diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec index fae003a6d5..c4bf614e1d 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-m32c-rtems4.10-binutils Summary: Binutils for target m32c-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 m32c-rtems4.10. %files -n rtems-4.10-m32c-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m32c-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/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec index 29ad15780e..efa2fa4993 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-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: m32c-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 6%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -160,7 +172,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} \ @@ -366,6 +379,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 diff --git a/contrib/crossrpms/rtems4.10/m32r/Makefile.am b/contrib/crossrpms/rtems4.10/m32r/Makefile.am index 60f1c995d1..f7099f7328 100644 --- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 6%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --disable-infos diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec index 1899638b13..465329eeb3 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-m32r-rtems4.10-binutils Summary: Binutils for target m32r-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 m32r-rtems4.10. %files -n rtems-4.10-m32r-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m32r-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/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec index 46160c4dcf..5eb518cb68 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-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: m32r-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 6%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -160,7 +172,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} \ @@ -366,6 +379,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 diff --git a/contrib/crossrpms/rtems4.10/m68k/Makefile.am b/contrib/crossrpms/rtems4.10/m68k/Makefile.am index 9f0b0affcc..23e8223d90 100644 --- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec index aa41cbe05d..2ccf3eec5c 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-m68k-rtems4.10-binutils Summary: Binutils for target m68k-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 m68k-rtems4.10. %files -n rtems-4.10-m68k-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m68k-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/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec index 2e54e5fc47..a8b1f6b582 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-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: m68k-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?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 diff --git a/contrib/crossrpms/rtems4.10/mips/Makefile.am b/contrib/crossrpms/rtems4.10/mips/Makefile.am index 8610ba2172..76f28158e0 100644 --- a/contrib/crossrpms/rtems4.10/mips/Makefile.am +++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 6%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec index 27b0e3d412..d16f68a137 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-mips-rtems4.10-binutils Summary: Binutils for target mips-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 mips-rtems4.10. %files -n rtems-4.10-mips-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/mips-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/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec index f31ba61708..82802a1574 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-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: mips-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 6%{?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 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 diff --git a/contrib/crossrpms/rtems4.10/sh/Makefile.am b/contrib/crossrpms/rtems4.10/sh/Makefile.am index 45bc730224..8a267876e7 100644 --- a/contrib/crossrpms/rtems4.10/sh/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec index e19a3c3535..e0a96a6ed8 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-sh-rtems4.10-binutils Summary: Binutils for target sh-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 sh-rtems4.10. %files -n rtems-4.10-sh-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/sh-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/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec index 5ae3084673..301457a6e5 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-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: sh-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?dist} +Release: 7%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -176,7 +188,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} \ @@ -381,6 +394,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 diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am index a8031116f8..04a82e2648 100644 --- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 3%{?dist} +GCC_RPMREL = 7%{?dist} NEWLIB_VERS = 1.16.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec index 993325a670..b8ef33a16c 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec @@ -45,7 +45,7 @@ Name: rtems-4.10-sparc-rtems4.10-binutils Summary: Binutils for target sparc-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 sparc-rtems4.10. %files -n rtems-4.10-sparc-rtems4.10-binutils %defattr(-,root,root) +%dir %{_prefix} %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/sparc-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/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec index 69c8eaeea1..c5b9c7a914 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-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: sparc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?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 |