diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-07-17 14:34:08 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-07-17 14:34:08 +0000 |
| commit | 9c4db5734d794193a4d25a40ca0ecb62a3712327 (patch) | |
| tree | a8cc884e48c1dd42821519dbb9395f5699c0a546 /contrib | |
| parent | 2009-07-17 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-9c4db5734d794193a4d25a40ca0ecb62a3712327.tar.bz2 | |
Update.
Diffstat (limited to 'contrib')
4 files changed, 8 insertions, 17 deletions
diff --git a/contrib/crossrpms/mingw32/i686/Makefile.am b/contrib/crossrpms/mingw32/i686/Makefile.am index 35ae406635..4388b2a400 100644 --- a/contrib/crossrpms/mingw32/i686/Makefile.am +++ b/contrib/crossrpms/mingw32/i686/Makefile.am @@ -5,11 +5,11 @@ TARGET = i686-pc-mingw32 include $(top_srcdir)/mkspec.am GMP_VERS = 4.2.4 -GMP_RPMREL = 0.20081219.1%{?dist} +GMP_RPMREL = 0.20090717.1%{?dist} include ../gmp.am MPFR_VERS = 2.3.1 -MPFR_RPMREL = 0.20081219.1%{?dist} +MPFR_RPMREL = 0.20090717.1%{?dist} include ../mpfr.am @rpmprefix@$(TARGET)-binutils-helper.spec: $(TARGET)-binutils-helper.spec.in diff --git a/contrib/crossrpms/mingw32/i686/gmp.add b/contrib/crossrpms/mingw32/i686/gmp.add index a755718293..1790d2c060 100644 --- a/contrib/crossrpms/mingw32/i686/gmp.add +++ b/contrib/crossrpms/mingw32/i686/gmp.add @@ -11,19 +11,16 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Version: %gmp_rpmvers -Summary: Cygwin gmp Libraries +Summary: MinGW gmp Libraries Source0: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 Provides: @rpmprefix@@tool_target@-gmp-devel = %{version}-%{release} %define _mingw32_target i686-pc-mingw32 -%if 0%{?fedora} >= 9 + # Fedora ships a mingw toolchain installed to /usr %define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root -%else -%define _mingw32_sysroot %{_prefix}/@tool_target@/sys-root -%endif BuildRequires: m4 BuildRequires: @rpmprefix@i686-pc-mingw32-gcc diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec index 2970fba5f7..be6057a193 100644 --- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec +++ b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec @@ -35,7 +35,7 @@ %define debug_package %{nil} Name: i686-pc-mingw32-gmp -Release: 0.20090717.0%{?dist} +Release: 0.20090717.1%{?dist} License: GPL Group: Development/Tools @@ -50,12 +50,9 @@ Source0: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 Provides: i686-pc-mingw32-gmp-devel = %{version}-%{release} %define _mingw32_target i686-pc-mingw32 -%if 0%{?fedora} >= 9 + # Fedora ships a mingw toolchain installed to /usr %define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root -%else -%define _mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root -%endif BuildRequires: m4 BuildRequires: i686-pc-mingw32-gcc diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec.in index 9fa0089314..45691f21ae 100644 --- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec.in +++ b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec.in @@ -52,7 +52,7 @@ %define debug_package %{nil} Name: @rpmprefix@i686-pc-mingw32-gmp -Release: 0.20090717.0%{?dist} +Release: 0.20090717.1%{?dist} License: GPL Group: Development/Tools @@ -67,12 +67,9 @@ Source0: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 Provides: @rpmprefix@i686-pc-mingw32-gmp-devel = %{version}-%{release} %define _mingw32_target i686-pc-mingw32 -%if 0%{?fedora} >= 9 + # Fedora ships a mingw toolchain installed to /usr %define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root -%else -%define _mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root -%endif BuildRequires: m4 BuildRequires: @rpmprefix@i686-pc-mingw32-gcc |