- uclibc headers are enough for build.

Changed files:
    crossarm-gcc.spec -> 1.18.2.5

diff --git a/crossarm-gcc.spec b/crossarm-gcc.spec
index 6c9b10803ed3f53ee5e9e11493b747ef3d03d549..20243926a029976a75f9f421a37ee90e3d7dd445 100644 (file)
--- a/crossarm-gcc.spec
+++ b/crossarm-gcc.spec
@@ -25,13 +25,10 @@ Source0:    ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/gcc-4.0-%{_snap}.tar.b
 %define                _llh_ver        2.6.10.0
 Source1:       http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-%{_llh_ver}.tar.bz2
 # Source1-md5: a43c53f1bb0b586bc9bd2e8abb19e2bc
-%define                _glibc_ver      2.3.4
-Source2:       ftp://sources.redhat.com/pub/glibc/releases/glibc-%{_glibc_ver}.tar.bz2
-# Source2-md5: 174ac5ed4f2851fcc866a3bac1e4a6a5
 %define                _uclibc_ver     0.9.27
-Source3:       http://uclibc.org/downloads/uClibc-%{_uclibc_ver}.tar.bz2
-# Source3-md5: 6250bd6524283bd8e7bc976d43a46ec0
-Source4:       crossarm-embedded-uclibc.config
+Source2:       http://uclibc.org/downloads/uClibc-%{_uclibc_ver}.tar.bz2
+# Source2-md5: 6250bd6524283bd8e7bc976d43a46ec0
+Source3:       crossarm-embedded-uclibc.config
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -78,41 +75,17 @@ This package adds C++ support to the GNU Compiler Collection for ARM.
 Ten pakiet dodaje obs³ugê C++ do kompilatora gcc dla ARM.
 
 %prep
-%setup -q -n gcc-4.0-%{_snap} -a1 -a2 -a3
+%setup -q -n gcc-4.0-%{_snap} -a1 -a2
 
 %build
 FAKE_ROOT=$PWD/fake-root
 rm -rf $FAKE_ROOT
 
-%if %{with eabi}
 install -d $FAKE_ROOT%{_prefix}
 cp -r uClibc-%{_uclibc_ver}/* $FAKE_ROOT%{_prefix}
 cd $FAKE_ROOT%{_prefix}
-install %{SOURCE4} .config
+install %{SOURCE3} .config
 %{__make} headers
-%else
-install -d $FAKE_ROOT%{_includedir}
-cp -r linux-libc-headers-%{_llh_ver}/include/{asm-arm,linux} $FAKE_ROOT%{_includedir}
-ln -s asm-arm $FAKE_ROOT%{_includedir}/asm
-
-cd glibc-%{_glibc_ver}
-cp -f /usr/share/automake/config.* scripts
-rm -rf builddir && install -d builddir && cd builddir
-../configure \
-       --prefix=$FAKE_ROOT/usr \
-       --build=%{_target_platform} \
-       --host=%{target} \
-       --disable-nls \
-       --with-headers=$FAKE_ROOT/usr/include \
-       --disable-sanity-checks \
-       --enable-hacker-mode
-
-%{__make} sysdeps/gnu/errlist.c
-%{__make} install-headers
-
-install bits/stdio_lim.h $FAKE_ROOT/usr/include/bits
-touch $FAKE_ROOT/usr/include/gnu/stubs.h
-%endif
 cd -
 
 cp -f /usr/share/automake/config.* .
@@ -186,13 +159,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{target}-gcc
 %dir %{gccarch}
 %dir %{gcclib}
-%dir %{gcclib}/thumb
+%{?with_eabi:%dir %{gcclib}/thumb}
 %attr(755,root,root) %{gcclib}/cc1
 %attr(755,root,root) %{gcclib}/collect2
 %{gcclib}/crt*.o
 %{gcclib}/libgcc.a
+%if %{with eabi}
 %{gcclib}/thumb/crt*.o
 %{gcclib}/thumb/libgcc.a
+%endif
 %{gcclib}/specs*
 %dir %{gcclib}/include
 %{gcclib}/include/*.h