[rtems-crossrpms commit] Regenerate.
Ralf Corsepius
ralf at rtems.org
Thu May 8 11:05:00 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: 1ae0c35ee1e55f57289c5f79895165a45460a980
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=1ae0c35ee1e55f57289c5f79895165a45460a980
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sat Feb 8 07:45:59 2014 +0100
Regenerate.
---
autotools/rtems-4.11-autoconf.spec | 6 +++++-
autotools/rtems-4.11-automake.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-binutils.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-cloog-ppl.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-expat.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-gcc.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-gmp.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-libs.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-mpc.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-mpfr.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-ncurses.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-readline.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-termcap.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-terminfo.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-w32api-headers.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-w32api-runtime.spec | 6 +++++-
cygwin/i686/i686-pc-cygwin-zlib.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-binutils.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-cloog-ppl.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-expat.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-gcc.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-gmp.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-libs.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-mpc.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-mpfr.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-ncurses.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-readline.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-terminfo.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec | 6 +++++-
cygwin/x86_64/x86_64-pc-cygwin-zlib.spec | 6 +++++-
freebsd7.4/i586/i586-pc-freebsd7.4-binutils.spec | 6 +++++-
freebsd7.4/i586/i586-pc-freebsd7.4-gcc.spec | 8 +++++++-
freebsd7.4/i586/i586-pc-freebsd7.4-libs.spec | 6 +++++-
freebsd8.4/i586/i586-pc-freebsd8.4-binutils.spec | 6 +++++-
freebsd8.4/i586/i586-pc-freebsd8.4-gcc.spec | 8 +++++++-
freebsd8.4/i586/i586-pc-freebsd8.4-libs.spec | 6 +++++-
.../x86_64/amd64-pc-freebsd8.4-binutils.spec | 6 +++++-
freebsd8.4/x86_64/amd64-pc-freebsd8.4-gcc.spec | 8 +++++++-
freebsd8.4/x86_64/amd64-pc-freebsd8.4-libs.spec | 6 +++++-
freebsd9.2/i586/i586-pc-freebsd9.2-binutils.spec | 6 +++++-
freebsd9.2/i586/i586-pc-freebsd9.2-gcc.spec | 8 +++++++-
freebsd9.2/i586/i586-pc-freebsd9.2-libs.spec | 6 +++++-
.../x86_64/amd64-pc-freebsd9.2-binutils.spec | 6 +++++-
freebsd9.2/x86_64/amd64-pc-freebsd9.2-gcc.spec | 8 +++++++-
freebsd9.2/x86_64/amd64-pc-freebsd9.2-libs.spec | 6 +++++-
.../sparc/sparc-sun-solaris2.7-binutils.spec | 6 +++++-
solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec | 8 +++++++-
solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec | 6 +++++-
49 files changed, 257 insertions(+), 49 deletions(-)
diff --git a/autotools/rtems-4.11-autoconf.spec b/autotools/rtems-4.11-autoconf.spec
index ca065e6..e5a05a8 100644
--- a/autotools/rtems-4.11-autoconf.spec
+++ b/autotools/rtems-4.11-autoconf.spec
@@ -28,8 +28,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -192,7 +196,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%post
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||:
diff --git a/autotools/rtems-4.11-automake.spec b/autotools/rtems-4.11-automake.spec
index c591ad1..dcc069a 100644
--- a/autotools/rtems-4.11-automake.spec
+++ b/autotools/rtems-4.11-automake.spec
@@ -28,8 +28,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -182,7 +186,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%post
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
diff --git a/cygwin/i686/i686-pc-cygwin-binutils.spec b/cygwin/i686/i686-pc-cygwin-binutils.spec
index 9cecb50..71f6c32 100644
--- a/cygwin/i686/i686-pc-cygwin-binutils.spec
+++ b/cygwin/i686/i686-pc-cygwin-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -144,7 +148,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i686-pc-cygwin-binutils
diff --git a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
index 591f3fa..c93097a 100644
--- a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
+++ b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -135,7 +139,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-expat.spec b/cygwin/i686/i686-pc-cygwin-expat.spec
index 84b6968..faff576 100644
--- a/cygwin/i686/i686-pc-cygwin-expat.spec
+++ b/cygwin/i686/i686-pc-cygwin-expat.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -132,7 +136,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index 173ee24..1da3536 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -587,7 +591,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i686-pc-cygwin-gcc
diff --git a/cygwin/i686/i686-pc-cygwin-gmp.spec b/cygwin/i686/i686-pc-cygwin-gmp.spec
index be26b67..b60234c 100644
--- a/cygwin/i686/i686-pc-cygwin-gmp.spec
+++ b/cygwin/i686/i686-pc-cygwin-gmp.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-libs.spec b/cygwin/i686/i686-pc-cygwin-libs.spec
index 4a8c83a..90eafcc 100644
--- a/cygwin/i686/i686-pc-cygwin-libs.spec
+++ b/cygwin/i686/i686-pc-cygwin-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -130,7 +134,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/cygwin/i686/i686-pc-cygwin-mpc.spec b/cygwin/i686/i686-pc-cygwin-mpc.spec
index 59e7595..1f69efb 100644
--- a/cygwin/i686/i686-pc-cygwin-mpc.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -134,7 +138,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-mpfr.spec b/cygwin/i686/i686-pc-cygwin-mpfr.spec
index d768cd9..5aab6ee 100644
--- a/cygwin/i686/i686-pc-cygwin-mpfr.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpfr.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-ncurses.spec b/cygwin/i686/i686-pc-cygwin-ncurses.spec
index a801a27..c865fed 100644
--- a/cygwin/i686/i686-pc-cygwin-ncurses.spec
+++ b/cygwin/i686/i686-pc-cygwin-ncurses.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -144,7 +148,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-readline.spec b/cygwin/i686/i686-pc-cygwin-readline.spec
index 4ccdd24..fce67fa 100644
--- a/cygwin/i686/i686-pc-cygwin-readline.spec
+++ b/cygwin/i686/i686-pc-cygwin-readline.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-termcap.spec b/cygwin/i686/i686-pc-cygwin-termcap.spec
index c681057..5805f8d 100644
--- a/cygwin/i686/i686-pc-cygwin-termcap.spec
+++ b/cygwin/i686/i686-pc-cygwin-termcap.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -130,7 +134,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-terminfo.spec b/cygwin/i686/i686-pc-cygwin-terminfo.spec
index 5a997fe..3911285 100644
--- a/cygwin/i686/i686-pc-cygwin-terminfo.spec
+++ b/cygwin/i686/i686-pc-cygwin-terminfo.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-headers.spec b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
index 62494ce..218f847 100644
--- a/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
+++ b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
index 8d79f44..bde3a97 100644
--- a/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
+++ b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/i686/i686-pc-cygwin-zlib.spec b/cygwin/i686/i686-pc-cygwin-zlib.spec
index b043871..f578710 100644
--- a/cygwin/i686/i686-pc-cygwin-zlib.spec
+++ b/cygwin/i686/i686-pc-cygwin-zlib.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-binutils.spec b/cygwin/x86_64/x86_64-pc-cygwin-binutils.spec
index 709b7a1..731787e 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-binutils.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# x86_64-pc-cygwin-binutils
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-cloog-ppl.spec b/cygwin/x86_64/x86_64-pc-cygwin-cloog-ppl.spec
index 4247d57..e22a5d6 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-cloog-ppl.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-cloog-ppl.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -135,7 +139,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-expat.spec b/cygwin/x86_64/x86_64-pc-cygwin-expat.spec
index 58265bc..4fbd83f 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-expat.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-expat.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -132,7 +136,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec b/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec
index ab76c11..511bad4 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -588,7 +592,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# x86_64-pc-cygwin-gcc
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-gmp.spec b/cygwin/x86_64/x86_64-pc-cygwin-gmp.spec
index ae1356d..b8a8e42 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-gmp.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-gmp.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-libs.spec b/cygwin/x86_64/x86_64-pc-cygwin-libs.spec
index f184669..542fbe1 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-libs.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -130,7 +134,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-mpc.spec b/cygwin/x86_64/x86_64-pc-cygwin-mpc.spec
index 0ab0c70..2a957a9 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-mpc.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-mpc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -134,7 +138,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-mpfr.spec b/cygwin/x86_64/x86_64-pc-cygwin-mpfr.spec
index beea1e8..9a73ff0 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-mpfr.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-mpfr.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-ncurses.spec b/cygwin/x86_64/x86_64-pc-cygwin-ncurses.spec
index 9ecb538..4c80c27 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-ncurses.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-ncurses.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -140,7 +144,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-readline.spec b/cygwin/x86_64/x86_64-pc-cygwin-readline.spec
index 5a3ac50..dbe1797 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-readline.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-readline.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-terminfo.spec b/cygwin/x86_64/x86_64-pc-cygwin-terminfo.spec
index 02a43e7..f5f4a91 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-terminfo.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-terminfo.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
index 681ce9b..ed38e1c 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
index 30eec42..94a756a 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -131,7 +135,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-zlib.spec b/cygwin/x86_64/x86_64-pc-cygwin-zlib.spec
index 30799b6..cace82a 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-zlib.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-zlib.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -133,7 +137,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
diff --git a/freebsd7.4/i586/i586-pc-freebsd7.4-binutils.spec b/freebsd7.4/i586/i586-pc-freebsd7.4-binutils.spec
index 445375c..7b27d07 100644
--- a/freebsd7.4/i586/i586-pc-freebsd7.4-binutils.spec
+++ b/freebsd7.4/i586/i586-pc-freebsd7.4-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd7.4-binutils
diff --git a/freebsd7.4/i586/i586-pc-freebsd7.4-gcc.spec b/freebsd7.4/i586/i586-pc-freebsd7.4-gcc.spec
index fdbbc25..1b82c69 100644
--- a/freebsd7.4/i586/i586-pc-freebsd7.4-gcc.spec
+++ b/freebsd7.4/i586/i586-pc-freebsd7.4-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -388,6 +392,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/i586-pc-freebsd7.4/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -512,6 +517,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -590,7 +596,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd7.4-gcc
diff --git a/freebsd7.4/i586/i586-pc-freebsd7.4-libs.spec b/freebsd7.4/i586/i586-pc-freebsd7.4-libs.spec
index 9a0e7f7..5b0f9b0 100644
--- a/freebsd7.4/i586/i586-pc-freebsd7.4-libs.spec
+++ b/freebsd7.4/i586/i586-pc-freebsd7.4-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -192,7 +196,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/freebsd8.4/i586/i586-pc-freebsd8.4-binutils.spec b/freebsd8.4/i586/i586-pc-freebsd8.4-binutils.spec
index e8bdea1..84c2737 100644
--- a/freebsd8.4/i586/i586-pc-freebsd8.4-binutils.spec
+++ b/freebsd8.4/i586/i586-pc-freebsd8.4-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd8.4-binutils
diff --git a/freebsd8.4/i586/i586-pc-freebsd8.4-gcc.spec b/freebsd8.4/i586/i586-pc-freebsd8.4-gcc.spec
index 9e9c666..f8091fd 100644
--- a/freebsd8.4/i586/i586-pc-freebsd8.4-gcc.spec
+++ b/freebsd8.4/i586/i586-pc-freebsd8.4-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -388,6 +392,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/i586-pc-freebsd8.4/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -512,6 +517,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -590,7 +596,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd8.4-gcc
diff --git a/freebsd8.4/i586/i586-pc-freebsd8.4-libs.spec b/freebsd8.4/i586/i586-pc-freebsd8.4-libs.spec
index 6cec3dc..60e6d37 100644
--- a/freebsd8.4/i586/i586-pc-freebsd8.4-libs.spec
+++ b/freebsd8.4/i586/i586-pc-freebsd8.4-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -203,7 +207,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-binutils.spec b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-binutils.spec
index b33a4e2..53c6ee7 100644
--- a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-binutils.spec
+++ b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# amd64-pc-freebsd8.4-binutils
diff --git a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-gcc.spec b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-gcc.spec
index 905280f..267a093 100644
--- a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-gcc.spec
+++ b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -388,6 +392,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/amd64-pc-freebsd8.4/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -512,6 +517,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -590,7 +596,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# amd64-pc-freebsd8.4-gcc
diff --git a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-libs.spec b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-libs.spec
index a4c4522..3a3ce04 100644
--- a/freebsd8.4/x86_64/amd64-pc-freebsd8.4-libs.spec
+++ b/freebsd8.4/x86_64/amd64-pc-freebsd8.4-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -207,7 +211,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/freebsd9.2/i586/i586-pc-freebsd9.2-binutils.spec b/freebsd9.2/i586/i586-pc-freebsd9.2-binutils.spec
index a1cce2f..3e959f4 100644
--- a/freebsd9.2/i586/i586-pc-freebsd9.2-binutils.spec
+++ b/freebsd9.2/i586/i586-pc-freebsd9.2-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd9.2-binutils
diff --git a/freebsd9.2/i586/i586-pc-freebsd9.2-gcc.spec b/freebsd9.2/i586/i586-pc-freebsd9.2-gcc.spec
index a06b430..fa39b23 100644
--- a/freebsd9.2/i586/i586-pc-freebsd9.2-gcc.spec
+++ b/freebsd9.2/i586/i586-pc-freebsd9.2-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -388,6 +392,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/i586-pc-freebsd9.2/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -512,6 +517,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -590,7 +596,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# i586-pc-freebsd9.2-gcc
diff --git a/freebsd9.2/i586/i586-pc-freebsd9.2-libs.spec b/freebsd9.2/i586/i586-pc-freebsd9.2-libs.spec
index 927de89..0d75a0d 100644
--- a/freebsd9.2/i586/i586-pc-freebsd9.2-libs.spec
+++ b/freebsd9.2/i586/i586-pc-freebsd9.2-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -150,7 +154,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-binutils.spec b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-binutils.spec
index 2e93337..9b291e1 100644
--- a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-binutils.spec
+++ b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -143,7 +147,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# amd64-pc-freebsd9.2-binutils
diff --git a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-gcc.spec b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-gcc.spec
index c85018d..a87fed2 100644
--- a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-gcc.spec
+++ b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -388,6 +392,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/amd64-pc-freebsd9.2/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -512,6 +517,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -590,7 +596,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# amd64-pc-freebsd9.2-gcc
diff --git a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-libs.spec b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-libs.spec
index 0dbd188..2e7508d 100644
--- a/freebsd9.2/x86_64/amd64-pc-freebsd9.2-libs.spec
+++ b/freebsd9.2/x86_64/amd64-pc-freebsd9.2-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -150,7 +154,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
index bced070..868589b 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -141,7 +145,7 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# sparc-sun-solaris2.7-binutils
diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
index 6a6596a..d8ed52f 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -381,6 +385,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
--with-sysroot=%{_exec_prefix}/sparc-sun-solaris2.7/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -505,6 +510,7 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
@@ -583,7 +589,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
# ==============================================================
# sparc-sun-solaris2.7-gcc
diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
index e2582a0..09ecfc4 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
@@ -13,8 +13,12 @@
%endif
%ifos cygwin cygwin32
+%if "%{_host}" == "x86_64-pc-cygwin"
+%define optflags -O2 -pipe
+%else
%define optflags -O3 -pipe -march=i486 -funroll-loops
%endif
+%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
@@ -132,7 +136,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
%endif
%clean
- rm -rf $RPM_BUILD_ROOT
+ %{?el5:rm -rf $RPM_BUILD_ROOT}
%package sys-root
Group: Development/Tools
More information about the vc
mailing list