change log for rtems (2010-04-25)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sun Apr 25 06:11:16 UTC 2010
*ralf*:
Revert to gcc-3.4.4.
M 1.57 contrib/crossrpms/cygwin/i686/Makefile.am
diff -u rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.56 rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.57
--- rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.56 Sun Mar 21 22:19:53 2010
+++ rtems/contrib/crossrpms/cygwin/i686/Makefile.am Sun Apr 25 00:12:03 2010
@@ -60,9 +60,9 @@
include ../binutils.am
BINUTILS_OPTS += --disable-infos
-GCC_VERS = 4.3.4
+GCC_VERS = 3.4.4
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20100204.0
+GCC_RPMREL = 0.20100225.0
include ../gcc.am
GCC_OPTS += --languages=c,cxx
GCC_OPTS += --disable-infos
*ralf*:
Refactor patching.
M 1.5 contrib/crossrpms/cygwin/gcc-prep.add
M 1.6 contrib/crossrpms/cygwin/i686/gcc-sources.add
diff -u rtems/contrib/crossrpms/cygwin/gcc-prep.add:1.4 rtems/contrib/crossrpms/cygwin/gcc-prep.add:1.5
--- rtems/contrib/crossrpms/cygwin/gcc-prep.add:1.4 Wed Mar 19 12:07:56 2008
+++ rtems/contrib/crossrpms/cygwin/gcc-prep.add Sun Apr 25 00:30:01 2010
@@ -1,4 +1,9 @@
# cygwin patches can't be directly applied through rpm
cd gcc-%{gcc_pkgvers}
-patch -p1 -t < %{SOURCE70} || true
+%if "%{gcc_version}" < "4.0"
+patch -p1 -t < %{PATCH70} || true
+%else
+patch -p2 -t < %{PATCH70} || true
+%endif
+%{?PATCH71:patch -p1 < %{PATCH71}}
cd ..
diff -u rtems/contrib/crossrpms/cygwin/i686/gcc-sources.add:1.5 rtems/contrib/crossrpms/cygwin/i686/gcc-sources.add:1.6
--- rtems/contrib/crossrpms/cygwin/i686/gcc-sources.add:1.5 Wed Aug 26 11:55:51 2009
+++ rtems/contrib/crossrpms/cygwin/i686/gcc-sources.add Sun Apr 25 00:29:34 2010
@@ -32,7 +32,17 @@
%{?_without_sources:NoSource: 5}
%endif
-# Cygwin patch from
-# ftp://cygwin.com/pub/cygwin/release/gcc/gcc-core/gcc-core-3.4.4-3-src.tar.bz2
-Source70: gcc-3.4.4-3.patch
+%if "%{gcc_version}" == "3.4.4"
+# Cygwin patch extracted from
+# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
+Patch70: gcc-3.4.4-3.patch
+Patch71: cygwin-gcc-3.4.4-3.diff
+%endif
+%if "%{gcc_version}" == "4.3.4"
+# Cygwin patch extracted from
+# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
+Patch70: gcc4-4.3.4-3.src.patch
+
+Patch71: cygwin-gcc4-4.3.4-3.diff
+%endif
*ralf*:
Bump BINUTILS_RPMREL.
M 1.58 contrib/crossrpms/cygwin/i686/Makefile.am
diff -u rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.57 rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.58
--- rtems/contrib/crossrpms/cygwin/i686/Makefile.am:1.57 Sun Apr 25 00:12:03 2010
+++ rtems/contrib/crossrpms/cygwin/i686/Makefile.am Sun Apr 25 00:36:48 2010
@@ -56,7 +56,7 @@
# Check bfd/configure for the real version number
BINUTILS_VERS = 2.19.51-1
BINUTILS_PKGVERS = 2.19.51-1
-BINUTILS_RPMREL = 0.20100204.0
+BINUTILS_RPMREL = 0.20100425.0
include ../binutils.am
BINUTILS_OPTS += --disable-infos
*ralf*:
Regenerate.
M 1.5 contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
M 1.5 contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
diff -u rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec:1.4 rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec:1.5
--- rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec:1.4 Thu Feb 4 09:35:53 2010
+++ rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec Sun Apr 25 00:37:05 2010
@@ -38,7 +38,7 @@
Summary: Binutils for target i686-pc-cygwin
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 0.20100204.0%{?dist}
+Release: 0.20100425.0%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,10 +49,8 @@
# Bug in bfd: Doesn't build without texinfo installed
BuildRequires: texinfo >= 4.2
%else
-%if "i686-pc-cygwin" == "i686-pc-cygwin"
BuildRequires: texinfo >= 4.2
%endif
-%endif
BuildRequires: flex
BuildRequires: bison
diff -u rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec:1.4 rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec:1.5
--- rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec:1.4 Mon Nov 30 02:50:46 2009
+++ rtems/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec Sun Apr 25 00:30:33 2010
@@ -41,7 +41,7 @@
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 0.20090907.0%{?dist}
+Release: 0.20100225.0%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,59 +50,163 @@
BuildRequires: %{_host_rpmprefix}gcc
-%if "%{gcc_version}" >= "4.3.0"
-%define _gmp_minvers 4.1
-%else
-%if "%{gcc_version}" >= "4.2.0"
+# FIXME: Disable lto for now, to avoid dependencies on libelf
+%bcond_with lto
+
+# FIXME: Disable python gdb scripts
+# ATM, no idea how to package them
+%bcond_with pygdb
+
+# FIXME: Disable GCC-plugin
+# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
+%bcond_with plugin
+
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version 0.8.1
+%global mpfr_version 2.4.1
+%global gmp_version 4.3.2
+%global libelf_version 0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc13}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
%endif
+
+%if 0%{?fc12}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
%endif
-%if %{defined _gmp_minvers}
-BuildRequires: gmp-devel >= %{_gmp_minvers}
-%if "%{_build}" != "%{_host}"
-BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
+%if 0%{?fc11}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.2.4
%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+# el6 beta ships mpfr but mpfr-devel is missing
+%global mpfr_provided %{nil}
+%global gmp_provided 4.3.1
%endif
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_0}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.3.1
+%global gmp_provided 4.2.2
+%endif
+
+%if 0%{?suse11_1}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.3.2
+%global gmp_provided 4.2.3
+%endif
+
+%if 0%{?suse11_2}
+%global mpc_provided 0.7
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
-%if "%{gcc_version}" >= "4.4.0"
-%define _mpfr_minvers 2.3.2
-%define mpfr_version 2.4.1
-%else
-%if "%{gcc_version}" >= "4.3.0"
-%define _mpfr_minvers 2.3.1
-%define mpfr_version 2.3.2
-%else
%if "%{gcc_version}" >= "4.2.0"
%endif
+
+%if "%{gcc_version}" >= "4.3.0"
+%define gmp_required 4.1
+%define mpfr_required 2.3.1
%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 0.15
%endif
-%if %{defined _mpfr_minvers}
-# FIXME: This is an ugly cludge
-%{?fc10:%global mpfr_provided 2.3.2}
-%{?fc11:%global mpfr_provided 2.4.1}
-%{?fc12:%global mpfr_provided 2.4.1}
-%{?suse11_0:%global mpfr_provided 2.3.1}
-%{?suse11_1:%global mpfr_provided 2.3.2}
-%{?suse11_2:%global mpfr_provided 2.4.1}
-%{?cygwin:%global mpfr_provided 2.4.1}
-%{?mingw32:%global mpfr_provided %{nil}}
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required 2.3.2
+%endif
-%if %{defined mpfr_provided}
-%if "%{mpfr_provided}" < "%{_mpfr_minvers}"
-%define _build_mpfr 1
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 0.8
+%if %{with lto}
+%define libelf_required 0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
+%endif
+%else
+%define _build_mpc 1
+%define gmp_required 4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
%if "%{_build}" != "%{_host}"
-BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers}
+BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
%else
-BuildRequires: mpfr-devel >= %{_mpfr_minvers}
+%define _build_libelf 1
%endif
%endif
+
+
+%if %{defined cloog_required}
+%{?fc11:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc12:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
+# el6 ships cloog-ppl, but cloog-ppl-devel is missing
+%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
+%endif
%else
%define _build_mpfr 1
%endif
-
%endif
%if "%{_build}" != "%{_host}"
@@ -123,8 +227,15 @@
Requires: i686-pc-cygwin-w32api
Requires: i686-pc-cygwin-gcc-libgcc = %{gcc_rpmvers}-%{release}
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires: zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}zlib-devel
+%endif
+%else
+%endif
-%define _gcclibdir %{_prefix}/lib
+%global _gcclibdir %{_prefix}/lib
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
%{?_without_sources:NoSource: 0}
@@ -133,15 +244,37 @@
%{?_without_sources:NoSource: 1}
-# Cygwin patch from
-# ftp://cygwin.com/pub/cygwin/release/gcc/gcc-core/gcc-core-3.4.4-3-src.tar.bz2
-Source70: gcc-3.4.4-3.patch
+%if "%{gcc_version}" == "3.4.4"
+# Cygwin patch extracted from
+# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
+Patch70: gcc-3.4.4-3.patch
+
+Patch71: cygwin-gcc-3.4.4-3.diff
+%endif
+%if "%{gcc_version}" == "4.3.4"
+# Cygwin patch extracted from
+# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
+Patch70: gcc4-4.3.4-3.src.patch
+Patch71: cygwin-gcc4-4.3.4-3.diff
+%endif
-%if "%{gcc_version}" >= "4.3.0"
+%if 0%{?_build_mpfr}
Source60: http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
%endif
+%if 0%{?_build_mpc}
+Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
+%endif
+
%description
Cross gcc for i686-pc-cygwin.
@@ -149,10 +282,14 @@
%setup -c -T -n %{name}-%{version}
%setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
%setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
@@ -166,9 +303,35 @@
ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
%endif
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+ # Build mpc one-tree style
+ ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+ # Build gmp one-tree style
+ ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+ # Build libelf one-tree style
+ ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
# cygwin patches can't be directly applied through rpm
cd gcc-%{gcc_pkgvers}
-patch -p1 -t < %{SOURCE70} || true
+%if "%{gcc_version}" < "4.0"
+patch -p1 -t < %{PATCH70} || true
+%else
+patch -p2 -t < %{PATCH70} || true
+%endif
+%{?PATCH71:patch -p1 < %{PATCH71}}
cd ..
# Fix timestamps
@@ -210,6 +373,8 @@
--enable-version-specific-runtime-libs \
--enable-threads \
--with-sysroot=%{_exec_prefix}/i686-pc-cygwin/sys-root \
+ %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
+ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
--enable-languages="$languages" $optargs
%if "%_host" != "%_build"
@@ -272,6 +437,13 @@
rmdir ${RPM_BUILD_ROOT}%{_prefix}/i686-pc-cygwin/include/bits
fi
+ # gcc >= 4.5.0: installs weird libstdc++ python bindings.
+%if ! %{with pygdb}
+ if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
+ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
+ fi
+%endif
+
# Collect multilib subdirectories
multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
@@ -317,6 +489,8 @@
*jc1) ;;
*jvgenmain) ;;
*/libgfortran*.*) echo "$i" >> build/files.gfortran ;;
+ %{!?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++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
@@ -447,7 +621,10 @@
%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
-
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
%files -n i686-pc-cygwin-gcc-libgcc -f build/files.gcc
%defattr(-,root,root)
@@ -457,12 +634,8 @@
%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
%if "%{gcc_version}" > "4.0.3"
-%if "i686-pc-cygwin" != "bfin-rtems4.10"
-%if "i686-pc-cygwin" != "avr-rtems4.10"
%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/ssp
%endif
-%endif
-%endif
%if "%{gcc_version}" >= "4.3.0"
%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include-fixed
@@ -496,7 +669,7 @@
License: GPL
%description -n i686-pc-cygwin-gcc-libstdc++
-%{_summary}
+%{summary}
%files -n i686-pc-cygwin-gcc-c++
*ralf*:
New.
A 1.1 contrib/crossrpms/patches/cygwin-gcc-3.4.4.diff
diff -u /dev/null rtems/contrib/crossrpms/patches/cygwin-gcc-3.4.4.diff:1.1
--- /dev/null Sun Apr 25 01:11:16 2010
+++ rtems/contrib/crossrpms/patches/cygwin-gcc-3.4.4.diff Sun Apr 25 00:38:06 2010
@@ -0,0 +1,12 @@
+diff -Naur gcc-3.4.4.cyg/libiberty/strsignal.c gcc-3.4.4/libiberty/strsignal.c
+--- gcc-3.4.4.cyg/libiberty/strsignal.c 2003-04-15 22:36:33.000000000 +0200
++++ gcc-3.4.4/libiberty/strsignal.c 2010-04-25 06:52:18.000000000 +0200
+@@ -409,7 +409,7 @@
+
+ #ifndef HAVE_STRSIGNAL
+
+-const char *
++char *
+ strsignal (signo)
+ int signo;
+ {
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100425/e9e5a53c/attachment.html>
More information about the vc
mailing list