diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-02-07 08:45:12 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-02-07 08:45:12 +0000 |
commit | 2659fa26f15c1298667547bfc2f4cd97597d8c11 (patch) | |
tree | 3c10566841046ed8a556c1f81050f15cd37c32e6 /contrib/crossrpms/rtems4.10/bfin | |
parent | Regenerate. (diff) | |
download | rtems-2659fa26f15c1298667547bfc2f4cd97597d8c11.tar.bz2 |
Regenerate.
Diffstat (limited to 'contrib/crossrpms/rtems4.10/bfin')
3 files changed, 35 insertions, 27 deletions
diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am index 9c0896826e..dd83fb87b8 100644 --- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am +++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am @@ -25,9 +25,8 @@ GDB_RPMREL = 5%{?dist} include ../gdb.am GDB_OPTS += -### bfin's GCC is too broken to be usable -## CPUKIT_VERS = 4.9.99.0 -## CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-1 -## CPUKIT_RPMREL = 1%{?dist} -## include ../cpukit.am -## CPUKIT_OPTS += +CPUKIT_VERS = 4.9.99.0 +CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 +CPUKIT_RPMREL = 1%{?dist} +include ../cpukit.am +CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec index 86558e2407..a8f79c351b 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec @@ -21,14 +21,22 @@ %ifos cygwin cygwin32 mingw mingw32 %define _exeext .exe +%define debug_package %{nil} +%define _libdir %{_exec_prefix}/lib %else %define _exeext %{nil} %endif %ifos cygwin cygwin32 %define optflags -O3 -pipe -march=i486 -funroll-loops -%define _libdir %{_exec_prefix}/lib -%define debug_package %{nil} +%endif + +%ifos mingw mingw32 +%if %{defined _mingw32_cflags} +%define optflags %{_mingw32_cflags} +%else +%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields +%endif %endif %if "%{_build}" != "%{_host}" @@ -38,22 +46,22 @@ %endif -%define cpukit_pkgvers 4.7.99.1-20070510 -%define cpukit_version 4.7.99.1 -%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )} +%define cpukit_pkgvers 4.9.99.0-20090206-2 +%define cpukit_version 4.9.99.0 +%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )} Name: rtems-4.10-bfin-rtems4.10-cpukit Summary: bfin-rtems4.10 cpukit Group: Development/Tools Version: %{cpukit_rpmvers} -Release: 1%{?dist}%{?dist} +Release: 1%{?dist} License: GPL URL: http://cpukit.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%define _use_internal_dependency_generator 0 +%define debug_package %{nil} BuildRequires: rtems-4.10-bfin-rtems4.10-gcc @@ -73,7 +81,7 @@ RTEMS cpukit for bfin-rtems4.10. mkdir -p build cd build - ../rtems-%{cpukit_pkgvers}/configure \ + ../rtems-%{cpukit_version}/configure \ --prefix=%{_prefix} \ --target=bfin-rtems4.10 \ --enable-multilib \ @@ -120,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ %define __os_install_post . ./os_install_post -cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides +cat << EOF > %{_builddir}/%{name}-%{version}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.10/' | %__find_provides EOF -chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides +chmod +x %{_builddir}/%{name}-%{version}/find-provides +%define __find_provides %{_builddir}/%{name}-%{version}/find-provides -cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires +cat << EOF > %{_builddir}/%{name}-%{version}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.10/' | %__find_requires EOF -chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires +chmod +x %{_builddir}/%{name}-%{version}/find-requires +%define __find_requires %{_builddir}/%{name}-%{version}/find-requires %clean rm -rf $RPM_BUILD_ROOT %description -n rtems-4.10-bfin-rtems4.10-cpukit -GNU cc compiler for bfin-rtems4.10. +RTEMS cpukit for target bfin-rtems4.10. %files -n rtems-4.10-bfin-rtems4.10-cpukit +%defattr(-,root,root) %dir %{_prefix} %{_prefix}/bfin-rtems4.10 # Violates the FHS 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 8120ab443a..727befcf05 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 @@ -60,7 +60,7 @@ Summary: bfin-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-bfin-rtems4.10-binutils -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "3.4" @@ -124,7 +124,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve %if "%{newlib_version}" == "1.17.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-%{newlib_pkgvers}-rtems4.10-20090203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-%{newlib_pkgvers}-rtems4.10-20090206.diff %endif %{?_without_sources:NoSource: 50} @@ -429,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-bfin-rtems4.10-binutils -# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -581,7 +581,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +601,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} License: Distributable Requires(post): /sbin/install-info |