- updated to 3.3.6

Changed files:
    crossm68k-gcc.spec -> 1.7

diff --git a/crossm68k-gcc.spec b/crossm68k-gcc.spec
index 063e28b50af565de0d936003859938e788a5707b..e4e38599e357a9f112c5841f62ac8c40842cdc19 100644 (file)
--- a/crossm68k-gcc.spec
+++ b/crossm68k-gcc.spec
@@ -3,25 +3,29 @@ Summary(es.UTF-8):    Utilitarios para desarrollo de binarios de la GNU - m68k gcc
 Summary(fr.UTF-8):     Utilitaires de développement binaire de GNU - m68k gcc
 Summary(pl.UTF-8):     Skrośne narzędzia programistyczne GNU dla m68k - gcc
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - m68k gcc
 Summary(fr.UTF-8):     Utilitaires de développement binaire de GNU - m68k gcc
 Summary(pl.UTF-8):     Skrośne narzędzia programistyczne GNU dla m68k - gcc
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - m68k gcc

-Summary(tr.UTF-8):     GNU geliÅ\9ftirme araçları - m68k gcc
+Summary(tr.UTF-8):     GNU geliţtirme araçlarý - m68k gcc

 Name:          crossm68k-gcc
 Name:          crossm68k-gcc

-Version:       2.95.3
+Version:       3.3.6

 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2

-# Source0-md5: 87ee083a830683e2aaa57463940a0c3c
-Patch0:                %{name}-full.patch
-Patch1:                %{name}-sigset.patch
-Patch2:                %{name}-zext.patch
-Patch3:                %{name}-build.patch
+# Source0-md5: 6936616a967da5a0b46f1e7424a06414
+Patch0:                %{name}-coldfire-targets.patch
+Patch1:                %{name}-coldfire-frame.patch
+Patch2:                %{name}-idshlib.patch
+Patch3:                %{name}-coldfire-omitfp.patch
+Patch4:                %{name}-specs.patch
+Patch5:                %{name}-thunk.patch
+Patch6:                %{name}-nowchar.patch

 BuildRequires: /bin/bash
 BuildRequires: autoconf
 BuildRequires: bison
 BuildRequires: crossm68k-binutils
 BuildRequires: crossm68k-uClibc
 BuildRequires: flex
 BuildRequires: /bin/bash
 BuildRequires: autoconf
 BuildRequires: bison
 BuildRequires: crossm68k-binutils
 BuildRequires: crossm68k-uClibc
 BuildRequires: flex

+BuildRequires: sed >= 4.0

 Requires:      crossm68k-binutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Requires:      crossm68k-binutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -30,7 +34,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                gccarch         %{_libdir}/gcc-lib/%{target}
 %define                gcclib          %{_libdir}/gcc-lib/%{target}/%{version}
 
 %define                gccarch         %{_libdir}/gcc-lib/%{target}
 %define                gcclib          %{_libdir}/gcc-lib/%{target}/%{version}
 

-%define                _noautostrip    .*%{gcclib}/.*libgcc\\.a
+%define                _noautostrip    .*lib.*\\.a

 
 %description
 This package contains a cross-gcc which allows the creation of
 
 %description
 This package contains a cross-gcc which allows the creation of


@@ -51,19 +55,25 @@ maszynach binariów do uruchamiania na m68k.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

+%patch4 -p1
+%patch5 -p1
+%patch6 -p1

 
 

-%build
-cd gcc
-%{__autoconf}
-cp -f /usr/share/automake/config.* .
-cd ..
-cp -f /usr/share/automake/config.* .
+sed -i 's#unsigned signo;#int signo;#'          \
+       libiberty/strsignal.c

 
 

-rm -rf obj-%{target}
-install -d obj-%{target} && cd obj-%{target}
+sed -i 's#char \*message;#const char *message;#' \
+       libiberty/strsignal.c

 
 

-# Bug: CFLAGS is used to target ...
-CFLAGS='-Os -Dlinux -D__linux__ -Dunix' \
+rm -rf libstdc++-v3/config/os/newlib
+ln -s  generic libstdc++-v3/config/os/newlib
+
+%build
+rm -rf %{target}-obj && install -d %{target}-obj && cd %{target}-obj
+
+CFLAGS="%{rpmcflags}" \
+CXXFLAGS="%{rpmcflags}" \
+TEXCONFIG=false \

 ../configure \
        --prefix=%{_prefix} \
        --infodir=%{_infodir} \
 ../configure \
        --prefix=%{_prefix} \
        --infodir=%{_infodir} \


@@ -71,56 +81,50 @@ CFLAGS='-Os -Dlinux -D__linux__ -Dunix' \
        --bindir=%{_bindir} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libdir} \
        --bindir=%{_bindir} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libdir} \

+       --disable-nls \

        --disable-shared \
        --disable-shared \

-       --disable-threads \
+       --disable-wchar_t \
+       --enable-languages="c" \

        --enable-target-optspace \
        --enable-target-optspace \

-       --enable-languages=c \
-       --enable-multilib \
-       --with-gnu-as \
-       --with-gnu-ld \
+       --enable-threads=posix \
+       --with-headers=%{arch}/include \
+       --with-multilib \
+       --with-newlib \
+       --with-system-zlib \
+       --without-x \

        --target=%{target} \
        --host=%{_target_platform} \
        --build=%{_target_platform}
        --target=%{target} \
        --host=%{_target_platform} \
        --build=%{_target_platform}

-

 cd ..
 cd ..

-%{__make} -C obj-%{target}
+%{__make} -C %{target}-obj

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} -C obj-%{target} install \
-        prefix=$RPM_BUILD_ROOT%{_prefix} \
-       bindir=$RPM_BUILD_ROOT%{_bindir} \
-        libdir=$RPM_BUILD_ROOT%{_libdir} \
-       mandir=$RPM_BUILD_ROOT%{_mandir} \
-       infodir=$RPM_BUILD_ROOT%{_infodir}
+%{__make} -C %{target}-obj install \
+       DESTDIR=$RPM_BUILD_ROOT

 
 

-# don't want this here
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
-rm -rf $RPM_BUILD_ROOT%{gcclib}/include/{README,asm,linux}
+find $RPM_BUILD_ROOT -type f -name 'libiberty.a' | \
+       xargs rm

 
 %if 0%{!?debug:1}
 
 %if 0%{!?debug:1}

-%{target}-strip --strip-debug                                  \
-                       $RPM_BUILD_ROOT%{gcclib}/*.o            \
-                       $RPM_BUILD_ROOT%{gcclib}/libgcc.a       \
-                       $RPM_BUILD_ROOT%{gcclib}/*/libgcc.a     \
-                       $RPM_BUILD_ROOT%{gcclib}/*/*/libgcc.a
+find $RPM_BUILD_ROOT -type f -name '*.[ao]' | \
+       xargs %{target}-strip --strip-debug

 %endif
 
 %endif
 

-mv $RPM_BUILD_ROOT%{_bindir}/cpp       $RPM_BUILD_ROOT%{_bindir}/%{target}-cpp
-mv $RPM_BUILD_ROOT%{_bindir}/gcov      $RPM_BUILD_ROOT%{_bindir}/%{target}-gcov
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_bindir}/%{target}-*
-%attr(755,root,root) %{gcclib}/cpp0
+%attr(755,root,root) %{_bindir}/%{target}-cpp
+%attr(755,root,root) %{_bindir}/%{target}-gc*

 %attr(755,root,root) %{gcclib}/cc1
 %attr(755,root,root) %{gcclib}/collect2
 %dir %{gccarch}
 %dir %{gcclib}
 %attr(755,root,root) %{gcclib}/cc1
 %attr(755,root,root) %{gcclib}/collect2
 %dir %{gccarch}
 %dir %{gcclib}

-%{gcclib}/[imSls]*
-%{gcclib}/crt*
+%dir %{gcclib}/include
+%{gcclib}/include/*.h
+%{gcclib}/m*
+%{gcclib}/specs

 %{_mandir}/man1/%{target}-gcc.1*
 %{_mandir}/man1/%{target}-gcc.1*