change log for rtems (2011-08-06)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sun Aug 7 04:10:21 UTC 2011
*ralf* (on branch rtems-4-9-branch):
Eliminate gccexec.
M 1.25.2.5 contrib/crossrpms/gcc/gccnewlib.add
M 1.15.4.6 contrib/crossrpms/gcc/install.add
M 1.9.2.4 contrib/crossrpms/gcc/target-c++.add
M 1.15.2.5 contrib/crossrpms/gcc/target-gcc.add
M 1.8.8.2 contrib/crossrpms/gcc/target-gcj.add
M 1.8.8.3 contrib/crossrpms/gcc/target-gfortran.add
M 1.8.8.2 contrib/crossrpms/gcc/target-gnat.add
M 1.7.8.3 contrib/crossrpms/gcc/target-objc.add
diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.4 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.5
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.4 Sat Aug 6 00:42:57 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 22:40:34 2011
@@ -87,7 +87,6 @@
BuildRequires: gmp-devel
%endif
-%define gccexec %{_libexecdir}/gcc
%global _gcclibdir %{_prefix}/lib
@SOURCES@
diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.5 rtems/contrib/crossrpms/gcc/install.add:1.15.4.6
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.5 Sat Aug 6 00:42:57 2011
+++ rtems/contrib/crossrpms/gcc/install.add Sat Aug 6 22:40:34 2011
@@ -57,7 +57,7 @@
# Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
# the fixinclude-install-tools
rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools
- rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
+ rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools
# Bug in gcc > 4.1.0: Installs an unused, empty directory
if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then
diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.3 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.4
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.3 Sat Aug 6 00:42:57 2011
+++ rtems/contrib/crossrpms/gcc/target-c++.add Sat Aug 6 22:40:34 2011
@@ -27,10 +27,10 @@
%{_bindir}/@tool_target at -c++%{_exeext}
%{_bindir}/@tool_target at -g++%{_exeext}
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.4 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.5
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.4 Sat Aug 6 00:42:58 2011
+++ rtems/contrib/crossrpms/gcc/target-gcc.add Sat Aug 6 22:40:34 2011
@@ -44,9 +44,9 @@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
%endif
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/@tool_target@/%{gcc_version}/collect2%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}
diff -u rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.1 rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.2
--- rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.1 Sat Aug 6 00:25:41 2011
+++ rtems/contrib/crossrpms/gcc/target-gcj.add Sat Aug 6 22:40:34 2011
@@ -39,10 +39,10 @@
%{_mandir}/man1/@tool_target at -rmi*.1*
%endif
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/jc1%{_exeext}
-%{gccexec}/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
%endif
diff -u rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.2 rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.3
--- rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.2 Sat Aug 6 00:13:08 2011
+++ rtems/contrib/crossrpms/gcc/target-gfortran.add Sat Aug 6 22:40:34 2011
@@ -22,9 +22,9 @@
%{_mandir}/man1/@tool_target at -gfortran.1*
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/f951%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext}
%endif
diff -u rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.1 rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.2
--- rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.1 Sat Aug 6 00:42:58 2011
+++ rtems/contrib/crossrpms/gcc/target-gnat.add Sat Aug 6 22:40:34 2011
@@ -24,10 +24,10 @@
%{_bindir}/@tool_target at -gnat*
%{_bindir}/@tool_target at -gprmake%{_exeext}
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/gnat1%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext}
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.2 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.3
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.2 Sat Aug 6 00:42:58 2011
+++ rtems/contrib/crossrpms/gcc/target-objc.add Sat Aug 6 22:40:34 2011
@@ -16,10 +16,10 @@
%files -n @rpmprefix@@tool_target at -gcc-objc -f build/files.objc
%defattr(-,root,root)
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
%endif
*ralf* (on branch rtems-4-9-branch):
Sync with cvs-HEAD.
M 1.14.2.6 contrib/crossrpms/gcc/build.add
M 1.14.2.5 contrib/crossrpms/gcc/build.add
M 1.14.2.4 contrib/crossrpms/gcc/build.add
M 1.25.2.9 contrib/crossrpms/gcc/gccnewlib.add
M 1.25.2.8 contrib/crossrpms/gcc/gccnewlib.add
M 1.25.2.7 contrib/crossrpms/gcc/gccnewlib.add
M 1.25.2.6 contrib/crossrpms/gcc/gccnewlib.add
M 1.15.4.8 contrib/crossrpms/gcc/install.add
M 1.15.4.7 contrib/crossrpms/gcc/install.add
M 1.5.2.5 contrib/crossrpms/gcc/prep.add
M 1.5.2.4 contrib/crossrpms/gcc/prep.add
M 1.9.2.5 contrib/crossrpms/gcc/target-c++.add
M 1.15.2.6 contrib/crossrpms/gcc/target-gcc.add
M 1.8.8.3 contrib/crossrpms/gcc/target-gcj.add
M 1.8.8.4 contrib/crossrpms/gcc/target-gfortran.add
M 1.8.8.3 contrib/crossrpms/gcc/target-gnat.add
M 1.4.6.2 contrib/crossrpms/gcc/target-newlib.add
M 1.7.8.4 contrib/crossrpms/gcc/target-objc.add
diff -u rtems/contrib/crossrpms/gcc/build.add:1.14.2.5 rtems/contrib/crossrpms/gcc/build.add:1.14.2.6
--- rtems/contrib/crossrpms/gcc/build.add:1.14.2.5 Sat Aug 6 22:57:45 2011
+++ rtems/contrib/crossrpms/gcc/build.add Sat Aug 6 22:58:07 2011
@@ -53,7 +53,7 @@
%if %build_newlib
--enable-newlib-io-c99-formats \
%endif
- --enable-languages="$languages" $optargs
+ --enable-languages="$languages"
%if "%_host" != "%_build"
# Bug in gcc-3.2.1:
diff -u rtems/contrib/crossrpms/gcc/build.add:1.14.2.4 rtems/contrib/crossrpms/gcc/build.add:1.14.2.5
--- rtems/contrib/crossrpms/gcc/build.add:1.14.2.4 Sat Aug 6 22:42:47 2011
+++ rtems/contrib/crossrpms/gcc/build.add Sat Aug 6 22:57:45 2011
@@ -19,9 +19,6 @@
%if %build_gnat
languages="$languages,ada"
%endif
-%if %build_libgcj
- optargs="--enable-libgcj"
-%endif
%if "%{_prefix}" != "/usr"
export PATH="%{_bindir}:${PATH}"
%endif
diff -u rtems/contrib/crossrpms/gcc/build.add:1.14.2.3 rtems/contrib/crossrpms/gcc/build.add:1.14.2.4
--- rtems/contrib/crossrpms/gcc/build.add:1.14.2.3 Fri Nov 27 04:20:12 2009
+++ rtems/contrib/crossrpms/gcc/build.add Sat Aug 6 22:42:47 2011
@@ -37,7 +37,7 @@
--bindir=%{_bindir} \
--exec_prefix=%{_exec_prefix} \
--includedir=%{_includedir} \
- --libdir=%{_libdir} \
+ --libdir=%{_gcclibdir} \
--libexecdir=%{_libexecdir} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.8 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.9
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.8 Sat Aug 6 23:05:37 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 23:07:25 2011
@@ -22,6 +22,74 @@
BuildRequires: %{_host_rpmprefix}gcc
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version 0.8.1
+%global mpfr_version 2.4.2
+%global gmp_version 4.3.2
+%global libelf_version 0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%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_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.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.2.0"
+%if %build_fortran
+%define gmp_required 4.1
+%define mpfr_required 2.2.1
+%endif
+%endif
+
%if "%{gcc_version}" >= "4.3.0"
BuildRequires: gmp-devel >= 4.1
%if "%{_build}" != "%{_host}"
diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.7 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.8
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.7 Sat Aug 6 23:03:02 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 23:05:37 2011
@@ -28,9 +28,13 @@
BuildRequires: %{_host_rpmprefix}gmp-devel
BuildRequires: %{_host_rpmprefix}mpfr-devel
%endif
-%if 0%{?fedora} >= 8
-BuildRequires: mpfr-devel >= 2.3.0
-%endif
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%if "%{?suse}" > "10.3"
BuildRequires: mpfr-devel >= 2.3.0
%endif
diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.6 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.7
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.6 Sat Aug 6 22:57:46 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 23:03:02 2011
@@ -81,9 +81,6 @@
BuildRequires: gcc-gnat
BuildRequires: @rpmprefix@@tool_target at -newlib < %{newlib_version}- at NEWLIB_RPMREL@
%endif
-%if %build_fortran
-BuildRequires: gmp-devel
-%endif
%global _gcclibdir %{_prefix}/lib
diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.5 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.6
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.5 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add Sat Aug 6 22:57:46 2011
@@ -8,8 +8,6 @@
%define newlib_version @NEWLIB_VERS@
%endif
-%define mpfr_version 2.3.1
-
Name: @rpmprefix@@tool_target at -gcc
Summary: @tool_target@ gcc
diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.7 rtems/contrib/crossrpms/gcc/install.add:1.15.4.8
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.7 Sat Aug 6 22:48:36 2011
+++ rtems/contrib/crossrpms/gcc/install.add Sat Aug 6 22:57:46 2011
@@ -87,21 +87,10 @@
rm -f dirs ;
echo "%defattr(-,root,root,-)" >> dirs
-%if "%{_prefix}" != "/usr"
- echo "%dir %{_prefix}" >> dirs
- echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
- echo "%dir %{_libexecdir}" >> dirs
-%endif
-%endif
- echo "%dir %{_gcclibdir}/gcc" >> dirs
- echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
-
TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
for i in $multilibs; do
case $i in
- \.) echo "%dir ${TGTDIR}" >> dirs
- ;;
+ \.) ;; # ignore, handled elsewhere
*) echo "%dir ${TGTDIR}/$i" >> dirs
;;
esac
diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.6 rtems/contrib/crossrpms/gcc/install.add:1.15.4.7
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.6 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/install.add Sat Aug 6 22:48:36 2011
@@ -24,7 +24,14 @@
%endif
# host library
+%if "%{gcc_version}" >= "4.2.0"
+ # libiberty doesn't honor --libdir, but always installs to a
+ # magically guessed _libdir
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+ # libiberty installs to --libdir=...
+ rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
# We use the version from binutils
rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -c++filt%{_exeext}
@@ -46,10 +53,8 @@
rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
%endif
-%if %build_fortran
-# # Bug in gcc-4.0.0pre
-# mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target at -gfortran
-%endif
+ # We don't want libffi's man-pages
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
# Bug in gcc-3.4.0pre
rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -@tool_target at -gcjh%{_exeext}
@@ -65,12 +70,12 @@
fi
# Collect multilib subdirectories
- f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+ multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
%if %build_newlib
echo "%defattr(-,root,root,-)" > build/files.newlib
TGTDIR="%{_exec_prefix}/@tool_target@/lib"
- for i in $f; do
+ for i in $multilibs; do
case $i in
\.) echo "%dir ${TGTDIR}" >> build/files.newlib
;;
@@ -93,7 +98,7 @@
echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
- for i in $f; do
+ for i in $multilibs; do
case $i in
\.) echo "%dir ${TGTDIR}" >> dirs
;;
diff -u rtems/contrib/crossrpms/gcc/prep.add:1.5.2.4 rtems/contrib/crossrpms/gcc/prep.add:1.5.2.5
--- rtems/contrib/crossrpms/gcc/prep.add:1.5.2.4 Sat Aug 6 22:48:36 2011
+++ rtems/contrib/crossrpms/gcc/prep.add Sat Aug 6 22:54:03 2011
@@ -52,6 +52,27 @@
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
+
@PREP@
# Fix timestamps
diff -u rtems/contrib/crossrpms/gcc/prep.add:1.5.2.3 rtems/contrib/crossrpms/gcc/prep.add:1.5.2.4
--- rtems/contrib/crossrpms/gcc/prep.add:1.5.2.3 Sat Aug 6 00:46:25 2011
+++ rtems/contrib/crossrpms/gcc/prep.add Sat Aug 6 22:48:36 2011
@@ -40,6 +40,9 @@
cd ..
# Copy the C library into gcc's source tree
ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+ # Make sure not to be using GPL'ed sources
+ rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+ rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
%endif
%if 0%{?_build_mpfr}
diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.4 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.5
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.4 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-c++.add Sat Aug 6 22:52:54 2011
@@ -7,6 +7,7 @@
Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
+Requires: @rpmprefix@@tool_target at -gcc-libstdc++ = %{gcc_rpmvers}-%{release}
%if "%{_build}" != "%{_host}"
BuildRequires: @rpmprefix@@tool_target at -gcc-c++ = %{gcc_rpmvers}
@@ -20,18 +21,44 @@
%description -n @rpmprefix@@tool_target at -gcc-c++
GCC c++ compiler for @tool_target at .
-%files -n @rpmprefix@@tool_target at -gcc-c++ -f build/files.g++
+
+%package -n @rpmprefix@@tool_target at -gcc-libstdc++
+Summary: libstdc++ for @tool_target@
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License: GPL
+
+%description -n @rpmprefix@@tool_target at -gcc-libstdc++
+%{summary}
+
+
+%files -n @rpmprefix@@tool_target at -gcc-c++
%defattr(-,root,root)
+%sysdir %{_prefix}
+
+%sysdir %{_mandir}
+%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target at -g++.1*
+%sysdir %{_bindir}
%{_bindir}/@tool_target at -c++%{_exeext}
%{_bindir}/@tool_target at -g++%{_exeext}
+%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
+
+%files -n @rpmprefix@@tool_target at -gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%sysdir %{_prefix}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
%endif
diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.5 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.6
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.5 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-gcc.add Sat Aug 6 22:51:52 2011
@@ -16,8 +16,25 @@
%description -n @rpmprefix@@tool_target at -gcc
GNU cc compiler for @tool_target at .
-%files -n @rpmprefix@@tool_target at -gcc -f build/files.gcc
+# ==============================================================
+# @rpmprefix@@tool_target at -gcc-libgcc
+# ==============================================================
+%package -n @rpmprefix@@tool_target at -gcc-libgcc
+Summary: libgcc for @tool_target at -gcc
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires: @rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
+License: GPL
+
+%description -n @rpmprefix@@tool_target at -gcc-libgcc
+libgcc @tool_target at -gcc.
+
+
+%files -n @rpmprefix@@tool_target at -gcc
%defattr(-,root,root)
+%sysdir %{_prefix}
+
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target at -gcc.1*
@@ -29,9 +46,30 @@
%{_bindir}/@tool_target at -gcc%{_exeext}
%{_bindir}/@tool_target at -gcc-%{gcc_version}%{_exeext}
%{_bindir}/@tool_target at -gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
%{_bindir}/@tool_target at -gccbug
+%endif
+
+%sysdir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/@tool_target@
+%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+%files -n @rpmprefix@@tool_target at -gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%sysdir %{_prefix}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
+
%if "%{gcc_version}" > "4.0.3"
%if "@tool_target@" != "bfin-rtems at rtems_api@"
%if "@tool_target@" != "avr-rtems at rtems_api@"
@@ -41,12 +79,6 @@
%endif
%if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
%endif
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}
-
diff -u rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.2 rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.3
--- rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.2 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-gcj.add Sat Aug 6 22:49:49 2011
@@ -2,31 +2,33 @@
# ==============================================================
# @rpmprefix@@tool_target at -gcj
# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcj
+%package -n @rpmprefix@@tool_target at -gcc-gcj
Summary: Java support (gcj) for @tool_target at -gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
-Provides: @rpmprefix@@tool_target at -gcc-gcj = %{gcc_rpmvers}-%{release}
%if %build_infos
Requires: @rpmprefix at gcc-gcj-common
%endif
Requires: @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-%description -n @rpmprefix@@tool_target at -gcj
+%description -n @rpmprefix@@tool_target at -gcc-gcj
RTEMS is an open source operating system for embedded systems.
This is the gcc/java compiler for @tool_target@
-%files -n @rpmprefix@@tool_target at -gcj -f build/files.gcj
+%files -n @rpmprefix@@tool_target at -gcc-gcj -f build/files.gcj
%defattr(-,root,root)
+%sysdir %{_bindir}
%{_bindir}/@tool_target at -gcj%{_exeext}
%{_bindir}/@tool_target at -jcf-dump%{_exeext}
%{_bindir}/@tool_target at -jv-scan%{_exeext}
%{_bindir}/@tool_target at -gcjh%{_exeext}
%{_bindir}/@tool_target at -*jar%{_exeext}
+%sysdir %{_mandir}
+%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target at -*jar.1*
%{_mandir}/man1/@tool_target at -gcj*.1*
%{_mandir}/man1/@tool_target at -jv-*.1*
@@ -39,10 +41,17 @@
%{_mandir}/man1/@tool_target at -rmi*.1*
%endif
+%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+
%endif
+
diff -u rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.3 rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.4
--- rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.3 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-gfortran.add Sat Aug 6 22:49:49 2011
@@ -11,20 +11,50 @@
%if %build_infos
Requires: @rpmprefix at gcc-gfortran-common
%endif
+Requires: @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
Requires: @rpmprefix@@tool_target at -gcc-libgfortran = %{gcc_rpmvers}-%{release}
%description -n @rpmprefix@@tool_target at -gcc-gfortran
GCC fortran compiler for @tool_target at .
-%files -n @rpmprefix@@tool_target at -gcc-gfortran -f build/files.gfortran
+%files -n @rpmprefix@@tool_target at -gcc-gfortran
%defattr(-,root,root)
+%sysdir %{_prefix}
+%sysdir %{_bindir}
%{_bindir}/@tool_target at -gfortran%{_exeext}
+%sysdir %{_mandir}
+%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target at -gfortran.1*
+%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext}
+
+# ==============================================================
+# @rpmprefix@@tool_target at -gcc-libgfortran
+# ==============================================================
+%package -n @rpmprefix@@tool_target at -gcc-libgfortran
+Summary: Fortran 95 support libraries for @tool_target at -gcc
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License: GPL
+
+%description -n @rpmprefix@@tool_target at -gcc-libgfortran
+%{summary}
+
+%files -n @rpmprefix@@tool_target at -gcc-libgfortran -f build/files.gfortran
+%defattr(-,root,root)
+%sysdir %{_prefix}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+%if "%{gcc_version}" >= "4.2.0"
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude
+%endif
%endif
diff -u rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.2 rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.3
--- rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.2 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-gnat.add Sat Aug 6 22:49:49 2011
@@ -7,7 +7,6 @@
Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
-Provides: @rpmprefix@@tool_target at -gcc-gnat = %{gcc_rpmvers}-%{release}
%if %_build_infos
Requires: @rpmprefix at gcc-gnat-common
@@ -21,14 +20,22 @@
%files -n @rpmprefix@@tool_target at -gcc-gnat
%defattr(-,root,root)
+%sysdir %{_prefix}
+
+%sysdir %{_bindir}
%{_bindir}/@tool_target at -gnat*
%{_bindir}/@tool_target at -gprmake%{_exeext}
+%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
%endif
diff -u rtems/contrib/crossrpms/gcc/target-newlib.add:1.4.6.1 rtems/contrib/crossrpms/gcc/target-newlib.add:1.4.6.2
--- rtems/contrib/crossrpms/gcc/target-newlib.add:1.4.6.1 Sat Feb 7 03:26:19 2009
+++ rtems/contrib/crossrpms/gcc/target-newlib.add Sat Aug 6 22:51:23 2011
@@ -8,6 +8,7 @@
License: Distributable
Version: %{newlib_version}
Release: @NEWLIB_RPMREL@
+%{?_with_noarch_subpackages:BuildArch: noarch}
%if %build_infos
Requires: @rpmprefix at newlib-common
@@ -18,7 +19,7 @@
%files -n @rpmprefix@@tool_target at -newlib -f build/files.newlib
%defattr(-,root,root)
-%sysdir %{_prefix}
+%sysdir %{_exec_prefix}
%dir %{_exec_prefix}/@tool_target@
%{_exec_prefix}/@tool_target@/include
diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.3 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.4
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.3 Sat Aug 6 22:40:34 2011
+++ rtems/contrib/crossrpms/gcc/target-objc.add Sat Aug 6 22:50:57 2011
@@ -9,18 +9,41 @@
License: GPL
Requires: @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
+Requires: @rpmprefix@@tool_target at -gcc-libobjc = %{gcc_rpmvers}-%{release}
%description -n @rpmprefix@@tool_target at -gcc-objc
GCC objc compiler for @tool_target at .
-%files -n @rpmprefix@@tool_target at -gcc-objc -f build/files.objc
+%files -n @rpmprefix@@tool_target at -gcc-objc
%defattr(-,root,root)
-
+%sysdir %{_exec_prefix}
+%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
+# ==============================================================
+# @rpmprefix@@tool_target at -gcc-libobjc
+# ==============================================================
+%package -n @rpmprefix@@tool_target at -gcc-libobjc
+Summary: Objective C support for @tool_target at -gcc
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License: GPL
+
+%description -n @rpmprefix@@tool_target at -gcc-libobjc
+Support libraries for GCC's objc compiler for @tool_target at .
+
+%files -n @rpmprefix@@tool_target at -gcc-libobjc -f build/files.objc
+%defattr(-,root,root)
+%sysdir %{_prefix}
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
%endif
--
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/20110806/46a9ab6e/attachment.html>
More information about the vc
mailing list