X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossavr-gcc.spec;h=8a424e4702472eefd29e24b37bb965ef309a1ef9;hb=a95770620796e954c0fa64a3fc256f3682e7ece5;hp=df43567a6b101645f9589c52a31e20b54ecb85db;hpb=6b88a12120aa1f77ea363eec7071cf8af7b9a03f;p=packages%2Fcrossavr-gcc.git

diff --git a/crossavr-gcc.spec b/crossavr-gcc.spec
index df43567..8a424e4 100644
--- a/crossavr-gcc.spec
+++ b/crossavr-gcc.spec
@@ -1,38 +1,55 @@
-Summary:	Cross AVR GNU Binary Utility Development Utilities - gcc
-Summary(pl):	Narzêdzia programistyczne GNU Cross AVR - gcc
+Summary:	Cross AVR GNU binary utility development utilities - gcc
+Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU - AVR gcc
+Summary(fr.UTF-8):	Utilitaires de développement binaire de GNU - AVR gcc
+Summary(pl.UTF-8):	Skrośne narzędzia programistyczne GNU dla AVR - gcc
+Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - AVR gcc
+Summary(tr.UTF-8):	GNU geliştirme araçları - AVR gcc
 Name:		crossavr-gcc
-Version:	3.0.4
+Version:	4.1.2
 Release:	1
 Epoch:		1
 License:	GPL
 Group:		Development/Languages
 Source0:	ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
-BuildRequires:	crossavr-binutils
-BuildRequires:	flex
-BuildRequires:	bison
+# Source0-md5:	a4a3eb15c96030906d8494959eeda23c
 BuildRequires:	autoconf
 BuildRequires:	/bin/bash
+BuildRequires:	bison
+BuildRequires:	crossavr-binutils
+BuildRequires:	flex
 Requires:	crossavr-binutils
+Requires:	gcc-dirs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		cxx		0
 %define		target		avr
-%define		_prefix		/usr
 %define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		gccarch		%{_libdir}/gcc/%{target}
+%define		gcclib		%{_libdir}/gcc/%{target}/%{version}
+%define		_noautostrip	.*%{gcclib}.*/libgc.*\\.a
 
 %description
 This package contains a cross-gcc which allows the creation of
-binaries to be run on Atmel AVR on i386-machines.
+binaries to be run on Atmel AVR on other machines.
+
+%description -l de.UTF-8
+Dieses Paket enthält einen Cross-gcc, der es erlaubt, auf einem
+anderem Rechner Code für Atmel AVR zu generieren.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera skrośny gcc pozwalający na robienie na innych
+maszynach binariów do uruchamiania na Atmel AVR.
+
+%package c++
+Summary:	C++ support for avr-gcc
+Summary(pl.UTF-8):	Obsługa C++ dla avr-gcc
+Group:		Development/Languages
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description -l de
-Dieses Paket enthält einen Cross-gcc, der es erlaubt, auf einem
-i386-Rechner Code für Atmel AVR zu generieren.
+%description c++
+This package adds C++ support to the GNU Compiler Collection for AVR.
 
-%description -l pl
-Ten pakiet zawiera cross-gcc pozwalaj±cy na robienie binariów do
-uruchamiania na Atmel AVR na maszynach i386.
+%description c++ -l pl.UTF-8
+Ten pakiet dodaje obsługę C++ do kompilatora gcc dla AVR.
 
 %prep
 %setup -q -n gcc-%{version}
@@ -44,82 +61,65 @@ cd obj-%{target}
 
 CFLAGS="%{rpmcflags}" \
 CXXFLAGS="%{rpmcflags}" \
-TEXCONFIG=false ../configure \
+TEXCONFIG=false \
+../configure \
 	--prefix=%{_prefix} \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
+	--bindir=%{_bindir} \
+	--libdir=%{_libdir} \
+	--libexecdir=%{_libdir} \
 	--disable-shared \
-	--enable-languages="c" \
-	--enable-long-long \
+	--disable-libssp \
+	--enable-languages="c,c++" \
 	--with-gnu-as \
 	--with-gnu-ld \
 	--with-system-zlib \
 	--with-multilib \
 	--without-x \
+	--build=%{_target_platform} \
+	--host=%{_target_platform} \
 	--target=%{target}
 
-PATH=$PATH:/sbin:%{_sbindir}
-
-cd ..
-#LDFLAGS_FOR_TARGET="%{rpmldflags}"
-
-%{__make} -C obj-%{target}
+%{__make} CFLAGS_FOR_TARGET="-Os"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/lib,%{_datadir},%{_bindir}}
-
-cd obj-%{target}
-PATH=$PATH:/sbin:%{_sbindir}
 
-%{__make} -C gcc install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	infodir=$RPM_BUILD_ROOT%{_infodir} \
-	gxx_include_dir=$RPM_BUILD_ROOT%{arch}/include/g++ \
+%{__make} -C obj-%{target} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# c++filt is provided by binutils
-#rm -f $RPM_BUILD_ROOT%{_bindir}/i386-mipsel-c++filt
-
-# what is this there for???
+# don't want it here
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 
-# the same... make hardlink
-#ln -f $RPM_BUILD_ROOT%{arch}/bin/gcc $RPM_BUILD_ROOT%{_bindir}/%{target}-gcc
-
-%{target}-strip -g $RPM_BUILD_ROOT%{gcclib}/libgcc.a
+%if 0%{!?debug:1}
+# strip target libraries
+%{target}-strip -g $RPM_BUILD_ROOT%{gcclib}{,/avr*}/libg*.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files 
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{target}-gcc
+%attr(755,root,root) %{_bindir}/%{target}-gcc*
 %attr(755,root,root) %{_bindir}/%{target}-cpp
-#%dir %{arch}/bin
-#%attr(755,root,root) %{arch}/bin/cpp
-#%attr(755,root,root) %{arch}/bin/gcc
-#%attr(755,root,root) %{arch}/bin/gcov
-#%{arch}/include/_G_config.h
+%attr(755,root,root) %{_bindir}/%{target}-gcov
 %dir %{gccarch}
 %dir %{gcclib}
 %attr(755,root,root) %{gcclib}/cc1
-%attr(755,root,root) %{gcclib}/tradcpp0
-%attr(755,root,root) %{gcclib}/cpp0
 %attr(755,root,root) %{gcclib}/collect2
-#%{gcclib}/SYSCALLS.c.X
-%{gcclib}/libgcc.a
-%{gcclib}/specs*
+%{gcclib}/libg*.a
+%{gcclib}/%{target}*
 %dir %{gcclib}/include
 %{gcclib}/include/*.h
-#%{gcclib}/include/iso646.h
-#%{gcclib}/include/limits.h
-#%{gcclib}/include/proto.h
-#%{gcclib}/include/stdarg.h
-#%{gcclib}/include/stdbool.h
-#%{gcclib}/include/stddef.h
-#%{gcclib}/include/syslimits.h
-#%{gcclib}/include/varargs.h
-#%{gcclib}/include/va-*.h
+%{_mandir}/man1/%{target}-cpp.1*
 %{_mandir}/man1/%{target}-gcc.1*
+%{_mandir}/man1/%{target}-gcov.1*
+
+%files c++
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{target}-g++
+%attr(755,root,root) %{_bindir}/%{target}-c++
+%attr(755,root,root) %{gcclib}/cc1plus
+%{_mandir}/man1/%{target}-g++.1*