diff --git a/.cvsignore b/.cvsignore index 00e527a..fdc89a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gcc-4.1.1-20070102.tar.bz2 +gcc-gnat-4.1.1-47.ppc.tar.gz diff --git a/gcc41.spec b/gcc41.spec index 192cf9b..6ec307d 100644 --- a/gcc41.spec +++ b/gcc41.spec @@ -1,10 +1,10 @@ %define DATE 20070102 %define gcc_version 4.1.1 -%define gcc_release 50 +%define gcc_release 50.1 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 -%ifarch %{ix86} x86_64 ia64 +%ifarch %{ix86} x86_64 ia64 ppc %define build_ada 1 %else %define build_ada 0 @@ -32,6 +32,7 @@ Source0: gcc-%{version}-%{DATE}.tar.bz2 Source1: libgcc_post_upgrade.c Source2: README.libgcjwebplugin.so Source3: protoize.1 +Source4: gcc-gnat-4.1.1-47.ppc.tar.gz URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -58,8 +59,10 @@ BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc. %endif %if %{build_ada} # Ada requires Ada to build +%ifnarch ppc BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif +%endif %ifarch ia64 BuildRequires: libunwind >= 0.98 %endif @@ -506,6 +509,9 @@ if [ -d libstdc++-v3/config/abi/sparc64-linux-gnu ]; then rm -rf libstdc++-v3/config/abi/sparc64-linux-gnu/32 fi %endif +%ifarch ppc +tar xfz %SOURCE4 +%endif %build @@ -543,6 +549,11 @@ EOF CC=`pwd`/gcc64 fi %endif +%ifarch ppc + CC=`pwd`/../usr/bin/gcc + export PATH=`pwd`/../usr/bin:$PATH + export LD_LIBRARY_PATH=`pwd`/../usr/lib +%endif OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'` case "$OPT_FLAGS" in *-fasynchronous-unwind-tables*) @@ -1545,6 +1556,9 @@ fi %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Wed Jan 3 2007 David Woodhouse 4.1.1-50.1 +- Bootstrap Ada on PowerPC + * Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 - backwards compatibility with old layout of struct _Unwind_Context (#220627) diff --git a/sources b/sources index 799986a..0df7f84 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8a44fdf031974e9640b6ca7c77f0b499 gcc-4.1.1-20070102.tar.bz2 +2cd152cc704b26bac00556007fcf58cc gcc-gnat-4.1.1-47.ppc.tar.gz