mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-28 07:20:16 +00:00
2004-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/gccnewlib.add: Disable gnats. Further preparations for gcc-3.4.0 * gcc3newlib/base-gcc.add, gcc3newlib/target-gnat.add, gcc3newlib/base-gcj.add, gcc3newlib/target-gcj.add: Reflect changes to gcc3newlib/gccnewlib.add.
This commit is contained in:
Ralf Corsepius
@@ -20,7 +20,7 @@ This is the files for gcc and newlib that are shared by all targets.
|
||||
%doc %{_prefix}/info/libc.info*
|
||||
%doc %{_prefix}/info/libm.info*
|
||||
%doc %{_prefix}/info/gccint.info*
|
||||
%if "%{gcc_version}" >= "3.4"
|
||||
%if "%{gcc_version}" > "3.4.0"
|
||||
%doc %{_prefix}/info/gccinstall.info*
|
||||
%endif
|
||||
|
||||
|
||||
@@ -14,15 +14,18 @@ This is the files for gcc/java (gcj) that are shared by all targets.
|
||||
|
||||
%files -n %{rpmprefix}rtems@osversion@-base-gcj
|
||||
%defattr(-,root,root)
|
||||
%if "%{gcc_version}" <= "3.4"
|
||||
%dir %{_prefix}/bin
|
||||
%{_prefix}/bin/jar%{_exeext}
|
||||
%{_prefix}/bin/grepjar%{_exeext}
|
||||
%endif
|
||||
|
||||
%dir %{_prefix}/info
|
||||
%doc %{_prefix}/info/gcj.info*.gz
|
||||
%doc %{_prefix}/info/gcj.info*
|
||||
%if "%{gcc_version}" >= "3.3"
|
||||
%doc %{_prefix}/info/fastjar.info*gz
|
||||
%doc %{_prefix}/info/fastjar.info*
|
||||
%endif
|
||||
%if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
|
||||
%dir %{_prefix}/man/man1
|
||||
%doc %{_prefix}/man/man1/gcjh.1*
|
||||
%doc %{_prefix}/man/man1/jv-scan.1*
|
||||
@@ -31,7 +34,6 @@ This is the files for gcc/java (gcj) that are shared by all targets.
|
||||
%doc %{_prefix}/man/man1/jv-convert.1*
|
||||
%doc %{_prefix}/man/man1/rmic.1*
|
||||
%doc %{_prefix}/man/man1/rmiregistry.1*
|
||||
%if "%{gcc_version}" >= "3.3"
|
||||
%doc %{_prefix}/man/man1/jar.1*
|
||||
%doc %{_prefix}/man/man1/grepjar.1*
|
||||
%endif
|
||||
|
||||
@@ -46,12 +46,13 @@ NoSource: 1
|
||||
# Use rpm -ba --define 'gnat [0|1]' xxx.spec to override building gnat for
|
||||
# those targets wanting to support ada.
|
||||
|
||||
%if "%{gcc_version}" >= "3.4"
|
||||
%if "%{gcc_version}" > "3.4.0"
|
||||
# default to building gnat
|
||||
%define _gnat %{?gnat:%gnat}%{!?gnat:1}
|
||||
%else
|
||||
# default to not building gnat
|
||||
# gcc-3.3: Doesn't support cross-building gnatlib
|
||||
# gcc-3.4.0: Doesn't support cross-build gnattools
|
||||
%define _gnat %{?gnat:%gnat}%{!?gnat:0}
|
||||
%endif
|
||||
|
||||
@@ -210,38 +211,28 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
|
||||
%endif
|
||||
|
||||
%if %build_gnat
|
||||
%if "%{gcc_version}" < "3.4"
|
||||
cd ../gcc-%{gcc_version}/gcc/ada
|
||||
touch treeprs.ads [es]info.h nmake.ad[bs]
|
||||
cd ../../../build
|
||||
%endif
|
||||
%endif
|
||||
|
||||
make all
|
||||
%if %build_gnat
|
||||
# This gnat configuration is crap :(
|
||||
|
||||
# This is what is documented, but it doesn't work for me (RC)
|
||||
# make gnatlib_and_tools
|
||||
%if "%{gcc_version}" >= "3.4"
|
||||
# This is what is documented - Of cause it doesn't work.
|
||||
make -C gcc gnatlib
|
||||
make -C gcc cross-gnattools
|
||||
make -C gcc ada.all.cross
|
||||
|
||||
# This should work, but doesn't.
|
||||
# make -C gcc gnatlib
|
||||
|
||||
%if "%{gcc_version}" >= "3.3"
|
||||
# gcc >= 3.3
|
||||
rm -rf gnatlib
|
||||
mkdir gnatlib
|
||||
pushd gnatlib
|
||||
ACC="../gcc/xgcc -B../gcc/ -B../%{gcc_target}/newlib/"
|
||||
ACC="$ACC -isystem ../%{gcc_target}/newlib/targ-include"
|
||||
ACC="$ACC -isystem ../../newlib-%{newlib_version}/newlib/libc/include"
|
||||
CC="$ACC" ../../gcc-%{gcc_version}/gcc/configure --disable-nls \
|
||||
--host=%{gcc_target} --target=%{gcc_target} --enable-languages=ada
|
||||
popd
|
||||
make -C gcc/ada ../stamp-gnatlib1 LN_S="ln -s"
|
||||
rm -f gcc/ada/rts/auto-target.h gcc/ada/rts/config.h
|
||||
cp gnatlib/auto-host.h gcc/ada/rts/auto-target.h
|
||||
sed -e 's,auto-host,auto-target,' < gcc/config.h > gcc/ada/rts/config.h
|
||||
%endif
|
||||
|
||||
%if "%{gcc_version}" < "3.4"
|
||||
# This is what had worked for some versions of gcc.
|
||||
make -C gcc cross-gnattools
|
||||
make -C gcc ada.all.cross
|
||||
# This is what gcc/ada/Makefile.in contains by default,
|
||||
# but what we override below
|
||||
GNATLIBCFLAGS="-g -O2"
|
||||
@@ -256,11 +247,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
|
||||
%endif
|
||||
make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib
|
||||
%endif
|
||||
|
||||
%endif
|
||||
make info
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
test $RPM_BUILD_ROOT = "%{_defaultbuildroot}" && \
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
cd build
|
||||
# Bug in gcc-2.95.1: It doesn't build this installation directory
|
||||
# If it doesn't find it, gcc doesn't install %{gcc_target}/bin/gcc
|
||||
@@ -299,10 +293,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
|
||||
%if "%{gcc_version}" >= "3.4"
|
||||
# Bug in gcc-3.4.0pre
|
||||
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
|
||||
%if "%{gcc_version}" < "3.4.1"
|
||||
# Broken in gcc-3.4.0pre
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/gccinstall.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%{gcc_version}" >= "3.3"
|
||||
# Bug in gcc-3.3.x: Despite we don't need fixincludes, it installs
|
||||
# Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
|
||||
# the fixinclude-install-tools
|
||||
rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools
|
||||
%endif
|
||||
|
||||
@@ -19,9 +19,23 @@ This is the gcc/java compiler for %{gcc_target}
|
||||
%{_prefix}/bin/%{gcc_target}-jcf-dump%{_exeext}
|
||||
%{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
|
||||
%{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
|
||||
%{_prefix}/man/man1/%{gcc_target}-gcj.1
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-gcj.1*
|
||||
|
||||
%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jc1%{_exeext}
|
||||
%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jvgenmain%{_exeext}
|
||||
%if "%{gcc_version}" >= "3.4"
|
||||
%{_prefix}/bin/%{gcc_target}-jar%{_exeext}
|
||||
%{_prefix}/bin/%{gcc_target}-grepjar%{_exeext}
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-jar.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-grepjar.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-rmic.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-rmiregistry.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-gcjh.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-gij.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-jcf-dump.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-jv-convert.1*
|
||||
%doc %{_prefix}/man/man1/%{gcc_target}-jv-scan.1*
|
||||
%endif
|
||||
|
||||
%{gccexec}/%{gcc_target}/%{gcc_version}/jc1%{_exeext}
|
||||
%{gccexec}/%{gcc_target}/%{gcc_version}/jvgenmain%{_exeext}
|
||||
|
||||
%endif
|
||||
|
||||
@@ -17,7 +17,7 @@ This is the gcc/gnat compiler for %{gcc_target}
|
||||
%dir %{_prefix}/bin
|
||||
%{_prefix}/bin/%{gcc_target}-gnat*
|
||||
|
||||
%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
|
||||
%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adalib
|
||||
%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adainclude
|
||||
%{gcclib}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
|
||||
%{gcclib}/%{gcc_target}/%{gcc_version}/adalib
|
||||
%{gcclib}/%{gcc_target}/%{gcc_version}/adainclude
|
||||
%endif
|
||||
|
||||
Reference in New Issue
Block a user