diff --git a/gcc.spec b/gcc.spec index 8d83e25..703dd30 100644 --- a/gcc.spec +++ b/gcc.spec @@ -29,9 +29,9 @@ %define disable_java 1 %endif -%if "%{?stage2}" == "1" - %define bootstrap_append -stage2 -%endif +#% if "%{?stage2}" == "1" +# % define bootstrap_append -stage2 +#% endif %define libstdcxx_name libstdc++6 %define libgcj_name libgcj4 @@ -41,7 +41,7 @@ Name: gcc Version: 4.9.2 -Release: 1mamba +Release: 2mamba Summary: GNU Compiler Collection (C, C++, Fortran, Java, Ada) Group: Applications/Development Vendor: openmamba @@ -74,8 +74,14 @@ License: GPL BuildRequires: binutils %else BuildRequires: cross-%{_target_platform}-binutils +%if "%{?stage1}" == "1" +BuildRequires: cross-%{_target_platform}-glibc-stage1 +%endif +%if "%{?stage2}" == "1" +BuildRequires: cross-%{_target_platform}-glibc-stage2 +%endif %if "%{?stage1}" != "1" -%if "%{?stage2}" != "2" +%if "%{?stage2}" != "1" %if "%{target_cpu}" != "avr" BuildRequires: cross-%{_target_platform}-glibc %endif @@ -92,7 +98,7 @@ BuildRequires: libmpc-devel BuildRequires: libmpfr-devel >= 2.1.2 %if "%{_target_platform}" == "%{_build}" BuildRequires: glibc-devel >= 2.5 -%if "%{?stage2}" != "1" +#% if "%{?stage2}" != "1" BuildRequires: tetex >= 3.0 BuildRequires: libgtk2-devel >= 2.8.17 BuildRequires: libalsa-devel >= 1.0.11 @@ -110,7 +116,7 @@ BuildRequires: antlr %endif BuildRequires: libcairo-devel >= 1.4.10 BuildRequires: libxcb-util-devel >= 0.2 -%endif +#% endif #% else # BuildRequires: cross-%{target_cpu}-glibc%{?glibc_require_append} >= 2.5 %endif @@ -470,8 +476,7 @@ AutoReqProv: no Cross Platform gcc for %{_target_platform}. %prep -%setup -n gcc-%{version}%{?gcc_extraver} -#-q -D +%setup -q -n gcc-%{version}%{?gcc_extraver} #-D -T #:<< ___EOF %patch2 -p0 @@ -533,7 +538,13 @@ case %{_target_platform} in ADDITIONAL_OPTS="" ;; arm-*) - ADDITIONAL_OPTS="" + abi=%{_target_platform} + abi=`echo ${abi/*-}` + if [ "$abi" = "gnueabihf" ]; then + ADDITIONAL_OPTS="--with-float=hard" + else + ADDITIONAL_OPTS="" + fi #"--enable-multilib" ;; avr*) @@ -566,11 +577,13 @@ esac --disable-nls \ --disable-shared \ --disable-threads \ - --enable-languages=c,objc,fortran \ + --enable-languages=c \ --with-newlib \ --without-headers \ --disable-libssp \ --disable-libgomp \ + --disable-libquadmath \ + --disable-libatomic \ %if "%{_target_platform}" != "%{_host}" --with-local-prefix=/usr/%{_target_platform} \ %endif @@ -1274,34 +1287,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %doc gcc/doc/gccint.pdf %endif # "%{disable_doc}" != "1" -%else -# -# Cross-platform single package -# -%files -n cross-%{_target_platform}-%{name}%{?bootstrap_append} -%defattr(-,root,root) -%{_bindir}/%{_target_platform}-* -%if "%{_target_platform}" != "avr" -%if "%{?stage1}" != "1" -%{_prefix}/%{_target_platform}/include/* -%{_prefix}/%{_target_platform}/%{_lib}/* -%endif -%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.a -%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.la -%{_prefix}/%{_target_platform}/%{_lib}/libobjc.a -%{_prefix}/%{_target_platform}/%{_lib}/libobjc.la -%if "%{target_cpu}" == "ppc" -%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.a -%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.la -%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.a -%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.la -%endif -%endif -%{_libdir}/gcc/%{_target_platform}/%{version}/* -%{_libexecdir}/gcc/%{_target_platform}/%{version}/* -%{_mandir}/man1/%{_target_platform}-* -%endif # cross-platform - %ifarch x86_64 %files -n gcc-multilib %defattr(-,root,root) @@ -1389,7 +1374,46 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_datadir}/gdb/auto-load/usr/lib/libstdc++.so.*-gdb.py %endif +%else +# +# Cross-platform single package +# +%files -n cross-%{_target_platform}-%{name}%{?bootstrap_append} +%defattr(-,root,root) +%{_bindir}/%{_target_platform}-* +%if "%{_target_platform}" != "avr" +%if "%{?stage1}" != "1" +%{_prefix}/%{_target_platform}/include/* +%if "%{target_cpu}" == "x86_64" +%{_prefix}/%{_target_platform}/%{_lib}/* +%else +%{_prefix}/%{_target_platform}/lib/* +%endif +%endif +#%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.a +#%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.la +#%{_prefix}/%{_target_platform}/%{_lib}/libobjc.a +#%{_prefix}/%{_target_platform}/%{_lib}/libobjc.la +%if "%{target_cpu}" == "ppc" +%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.a +%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.la +%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.a +%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.la +%endif +%endif +%{_libdir}/gcc/%{_target_platform}/%{version}/* +%if "%{target_cpu}" == "x86_64" +%{_libexecdir}/gcc/%{_target_platform}/%{version}/* +%else +%{_prefix}/libexec/gcc/%{_target_platform}/%{version}/* +%endif +%{_mandir}/man1/%{_target_platform}-* +%endif # cross-platform + %changelog +* Thu Apr 09 2015 Silvan Calarco 4.9.2-2mamba +- new target: arm-openmamba-linux-gnueabihf + * Thu Oct 30 2014 Automatic Build System 4.9.2-1mamba - automatic version update by autodist