- aieeeee, reverted accidental commit

Changed files:
    crossppc-gcc.spec -> 1.35

diff --git a/crossppc-gcc.spec b/crossppc-gcc.spec
index baad8c549601b3439c59d6af0291ffdb56e54da3..0a1ba791602ed98a036fd36675cbc12fda8ec60d 100644 (file)
--- a/crossppc-gcc.spec
+++ b/crossppc-gcc.spec
@@ -5,50 +5,14 @@ Summary(pl.UTF-8):    Skrośne narzędzia programistyczne GNU dla PPC - gcc
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - PPC gcc
 Summary(tr.UTF-8):     GNU geliştirme araçları - PPC gcc
 Name:          crossppc-gcc
-Version:       4.1.2
-Release:       0.1
+Version:       4.0.2
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
-# Source0-md5: a4a3eb15c96030906d8494959eeda23c
-Patch0:                gcc-info.patch
-Patch1:                gcc-nolocalefiles.patch
-Patch2:                gcc-nodebug.patch
-Patch3:                gcc-ada-link.patch
-Patch4:                gcc-sparc64-ada_fix.patch
-Patch5:                gcc-alpha-ada_fix.patch
-# -fvisibility fixes...
-Patch6:                gcc-pr19664_gnu_internal.patch
-Patch7:                gcc-pr19664_libstdc++.patch
-Patch8:                gcc-pr20218.patch
-
-# PRs
-Patch10:       gcc-pr7776.patch
-Patch11:       gcc-pr19606.patch
-Patch12:       gcc-pr24879.patch
-Patch13:       gcc-pr29512.patch
-Patch14:       gcc-pr28281.patch
-Patch15:       gcc-unwind-through-signal-frames.patch
-
-Patch18:       gcc-pr24419.patch
-Patch19:       gcc-pr24669.patch
-Patch20:       gcc-pr17390.patch
-Patch21:       gcc-pr13676.patch
-Patch22:       gcc-pr25626.patch
-Patch23:       gcc-libstdcxx-bitset.patch
-
-Patch25:       gcc-libjava-multilib.patch
-Patch26:       gcc-ppc64-m32-m64-multilib-only.patch
-Patch27:       gcc-enable-java-awt-qt.patch
-
-# 128-bit long double support for glibc 2.4
-Patch30:       gcc-ldbl-default-libstdc++.patch
-Patch31:       gcc-ldbl-default.patch
-
-# Needed too bootstrap with gcc 4.2
-Patch40:       gcc-ada.patch
-
+# Source0-md5: a659b8388cac9db2b13e056e574ceeb0
+Patch0:                gcc-pr25715.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -67,14 +31,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                gccarch         %{_libdir}/gcc/%{target}
 %define                gcclib          %{gccarch}/%{version}
 
-# used for crtbegin.o / crtend.o
-%if 0%{?debug:1}
-%define                target_cflags   %{debugcflags}
-%else
-%define                target_cflags   -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
-%endif
-
-
 %define                _noautostrip    .*/libgc.*\\.a
 
 %description
@@ -103,98 +59,50 @@ Ten pakiet dodaje obsługę C++ do kompilatora gcc dla PPC.
 
 %prep
 %setup -q -n gcc-%{version}
-
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# -fvisbility fixes...
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-# PRs
-%patch10 -p1
-%patch11 -p0
-%patch12 -p0
-%patch13 -p1
-
-%ifarch %{x8664}
-%patch14 -p1
-%endif
-%patch15 -p0
-
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-
-%patch30 -p0
-%patch31 -p0
-
-%patch40 -p1
-
-# because we distribute modified version of gcc...
-sed -i 's:#define VERSUFFIX.*:#define VERSUFFIX " (PLD-Linux)":' gcc/version.c
-perl -pi -e 's@(bug_report_url.*<URL:).*";@$1http://bugs.pld-linux.org/>";@' gcc/version.c
-
-mv ChangeLog ChangeLog.general
 
 %build
-cd gcc
-%{__autoconf}
-cd ..
 cp -f /usr/share/automake/config.* .
-
-rm -rf builddir && install -d builddir && cd builddir
+rm -rf obj-%{target}
+install -d obj-%{target}
+cd obj-%{target}
 
 CFLAGS="%{rpmcflags}" \
-CXXFLAGS="%{rpmcxxflags}" \
+CXXFLAGS="%{rpmcflags}" \
 TEXCONFIG=false \
 ../configure \
        --prefix=%{_prefix} \
-       --with-local-prefix=%{_prefix}/local \
-       --libdir=%{_libdir} \
-       --libexecdir=%{_libdir} \
        --infodir=%{_infodir} \
        --mandir=%{_mandir} \
        --bindir=%{_bindir} \
+       --libdir=%{_libdir} \
+       --libexecdir=%{_libdir} \
        --disable-shared \
        --disable-threads \
        --without-headers \
        --enable-languages="c,c++" \
        --enable-c99 \
        --enable-long-long \
-       --disable-multilib \
        --disable-nls \
        --with-gnu-as \
        --with-gnu-ld \
        --with-demangler-in-ld \
        --with-system-zlib \
+       --disable-multilib \
        --without-x \
        --target=%{target} \
        --host=%{_target_platform} \
        --build=%{_target_platform}
 
-%{__make} all-gcc \
-       CFLAGS_FOR_TARGET="%{target_cflags}"
+%{__make} all-gcc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C builddir install-gcc \
+%{__make} -C obj-%{target} install-gcc \
        DESTDIR=$RPM_BUILD_ROOT
 
-install builddir/gcc/specs $RPM_BUILD_ROOT%{gcclib}
+install obj-%{target}/gcc/specs $RPM_BUILD_ROOT%{gcclib}
 
 # don't want this here
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a