2002-08-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* gcc3newlib/base-gnat.add: Don't use %{%prefix}/bin/gnat*.
	* gcc3newlib/Makefile.am: Use mkspec for c4x.
	* gcc3newlib/gccnewlib.add: Rework processing of %if %build_XXX.
	Rework handing Ada.
	Don't put adalib and adainclude into files.gcc.
	* gcc3newlib/target-gnat.add: Add adalib.
	Add adainclude.
This commit is contained in:
Ralf Corsepius
2002-08-13 14:01:03 +00:00
parent 771e79d6a9
commit 513afacb12
5 changed files with 39 additions and 14 deletions

View File

@@ -1,3 +1,13 @@
2002-08-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/base-gnat.add: Don't use %{%prefix}/bin/gnat*.
* gcc3newlib/Makefile.am: Use mkspec for c4x.
* gcc3newlib/target-gnat.add: Rework processing of %if %build_XXX.
Rework handing Ada.
Don't put adalib and adainclude into files.gcc.
* gcc3newlib/target-gnat.add: Add adalib.
Add adainclude.
2002-08-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-08-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/base-gnat.add: Use -n rtems-base-gnat. * gcc3newlib/base-gnat.add: Use -n rtems-base-gnat.

View File

@@ -37,8 +37,8 @@ arm-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
RPM_SPECS_DATA += arm-rtems-$(GCC3NEWLIBVERS).spec RPM_SPECS_DATA += arm-rtems-$(GCC3NEWLIBVERS).spec
c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS) c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIB_DEPS)
$(MKSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
RPM_SPECS_DATA += c4x-rtems-$(GCC3NEWLIBVERS).spec RPM_SPECS_DATA += c4x-rtems-$(GCC3NEWLIBVERS).spec
h8300-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) h8300-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)

View File

@@ -14,5 +14,5 @@ This is the gcc/gnat tools for the gcc/gnat compiler
%files -n rtems-base-gnat %files -n rtems-base-gnat
%dir %{_prefix}/bin %dir %{_prefix}/bin
%{_prefix}/bin/gnat* # %{_prefix}/bin/gnat*
%endif %endif

View File

@@ -50,16 +50,22 @@ NoSource: 1
%define build_gnat 0 %define build_gnat 0
%if "@target_alias@" == "c4x-rtems" %if "@target_alias@" == "c4x-rtems"
%define build_gnat 0
%define build_cxx 0 %define build_cxx 0
%elseif "@target_alias@" == "i386-rtems" %endif
%if "@target_alias@" == "i386-rtems"
%define build_gnat 1 %define build_gnat 1
%elseif "@target_alias@" == "i960-rtems" %endif
%define build_gnat 0
%if "@target_alias@" == "i960-rtems"
%define build_cxx 0 %define build_cxx 0
%elseif "@target_alias@" == "powerpc-rtems" %endif
%if "@target_alias@" == "powerpc-rtems"
%define build_gnat 1 %define build_gnat 1
%elseif "@target_alias@" == "sparc-rtems" %endif
%if "@target_alias@" == "sparc-rtems"
%define build_gnat 1 %define build_gnat 1
%endif %endif
@@ -102,7 +108,10 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
# CONFIGURE_ARGS="--build=%{_build} --host=%{_target}" # CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
# %endif # %endif
languages="c,c++" languages="c"
%if %build_cxx
languages="$languages,c++"
%endif
%if %build_g77 %if %build_g77
languages="$languages,g77" languages="$languages,g77"
%endif %endif
@@ -128,11 +137,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%endif %endif
make all make all
%if %build_gnat %if %build_gnat
cd gcc
# This is what is documented, but it doesn't work for me (RC) # This is what is documented, but it doesn't work for me (RC)
# make gnatlib_and_tools # make gnatlib_and_tools
make cross-gnattools make -C gcc cross-gnattools
cd .. make -C gcc ada.all.cross
make -C gcc gnatlib
%endif %endif
make info make info
@@ -144,7 +153,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
# $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin # $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
# #
make prefix=$RPM_BUILD_ROOT%{_prefix} install make prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} install
cd @target_alias@/newlib cd @target_alias@/newlib
make prefix=$RPM_BUILD_ROOT%{_prefix} \ make prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} install-info bindir=$RPM_BUILD_ROOT%{_bindir} install-info
@@ -215,6 +225,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
*libobjc*) echo "$i" >> files.objc ;; *libobjc*) echo "$i" >> files.objc ;;
*include/objc*) ;; *include/objc*) ;;
*include/g++*);; *include/g++*);;
*adainclude*);;
*adalib*);;
*gnat1);;
*jc1) ;; *jc1) ;;
*jvgenmain) ;; *jvgenmain) ;;
*cc1plus) ;; # ignore: explicitly put into rpm elsewhere *cc1plus) ;; # ignore: explicitly put into rpm elsewhere

View File

@@ -19,4 +19,6 @@ This is the gcc/gnat compiler for @target_alias@
%{_prefix}/bin/@target_alias@-gnat* %{_prefix}/bin/@target_alias@-gnat*
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/gnat1@exe_ext@ %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/gnat1@exe_ext@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adalib
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adainclude
%endif %endif