2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* rtemsdoc/Makefile.am: Use $(top_builddir)/common/common.add,
	$(top_builddir)/common/clean.add, header.add.
	Generate rtemsdoc.spec.in.
	* rtemsdoc/mkspec.in: Remove exe_ext.
	* rtemsdoc/rtemsdoc.spec.in: Remove.
	* gccnewlib/Makefile.am:  Use $(top_builddir)/common/common.add,
        $(top_builddir)/common/clean.add, header.add.
	* gccnewlib/base-gcc.m4: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/base-gcj.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/gccnewlib.add: Replace @exe_ext@ with %{_exeext}.
	Remove header, broken cdn-X configuration, %clean.
	* gccnewlib/target-g77.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-gcc.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-gcj.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-objc.add: Replace @exe_ext@ with %{_exeext}.
This commit is contained in:
Ralf Corsepius
2003-01-31 06:22:09 +00:00
parent 9c8ee7b2bd
commit 59292fe9af
12 changed files with 57 additions and 150 deletions
+7 -3
View File
@@ -5,8 +5,11 @@
MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
SUBPACKAGES = gccnewlib.add \
base-gcc.add target-gcc.add \
SUBPACKAGES = header.add
SUBPACKAGES += ../common/common.add
SUBPACKAGES += gccnewlib.add
SUBPACKAGES += ../common/clean.add
SUBPACKAGES += base-gcc.add target-gcc.add \
base-chill.add target-chill.add \
base-g77.add target-g77.add \
base-gcj.add target-gcj.add \
@@ -17,7 +20,8 @@ gccnewlib.spec.in: $(SUBPACKAGES)
| sed -e 's%@GCCLANGS@%%g' > $@
CLEANFILES = gccnewlib.spec.in
gccnewlib_c_only.spec.in: gccnewlib.add base-gcc.add target-gcc.add
gccnewlib_c_only.spec.in: header.add ../common/common.add \
gccnewlib.add ../common/clean.add base-gcc.add target-gcc.add
cat $^ \
| sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@
CLEANFILES += gccnewlib_c_only.spec.in
+1 -1
View File
@@ -20,7 +20,7 @@ This is the files for gcc and newlib that are shared by all targets.
%doc %{_prefix}/info/libm.info*.gz
%dir %{_prefix}/bin
%{_prefix}/bin/gcov@exe_ext@
%{_prefix}/bin/gcov%{_exeext}
%dir %{_prefix}/man
%dir %{_prefix}/man/man1
+3 -3
View File
@@ -14,7 +14,7 @@ This is the files for gcc/java (gcj) that are shared by all targets.
%files -n rtems-base-gcj
%dir %{_prefix}/bin
%{_prefix}/bin/jcf-dump@exe_ext@
%{_prefix}/bin/jv-scan@exe_ext@
%{_prefix}/bin/gcjh@exe_ext@
%{_prefix}/bin/jcf-dump%{_exeext}
%{_prefix}/bin/jv-scan%{_exeext}
%{_prefix}/bin/gcjh%{_exeext}
+5 -26
View File
@@ -1,15 +1,3 @@
#
# spec file for building gcc for rtems
#
# Copyright (c) 1999,2000,2001 OARCorp, Huntsville, AL
#
# please send bugfixes or comments to joel@OARcorp.com
#
%define _prefix @prefix@
Vendor: OAR Corporation
Distribution: Linux
Name: @target_alias@-gcc-newlib
Summary: gcc and newlib C Library for @target_alias@.
Group: rtems
@@ -72,12 +60,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%build
cd build
# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it.
%if "%{target_os}" != "%{build_os}"
CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
%endif
../gcc-@gcc_version@/configure $CONFIGURE_ARGS --target=@target_alias@ \
../gcc-@gcc_version@/configure \
--target=@target_alias@ \
--with-gnu-as --with-gnu-ld --with-newlib --verbose \
--enable-threads --prefix=%{_prefix} @GCCLANGS@
@@ -100,10 +84,10 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
# Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
# Rename it to target_alias-cpp
if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@;
if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
then
mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@ \
$RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp@exe_ext@
mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
$RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp%{_exeext}
fi
# gzip info files
@@ -149,8 +133,3 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
esac
done
%clean
# let rpm --clean remove BuildRoot iif using the default BuildRoot
test "$RPM_BUILD_ROOT" = "%{_tmppath}/%{name}" && \
rm -rf $RPM_BUILD_ROOT
+2 -2
View File
@@ -14,6 +14,6 @@ This is the gcc/g77 compiler for @target_alias@
%files -n @target_alias@-g77 -f build/files.g77
%dir %{_prefix}/bin
%{_prefix}/bin/@target_alias@-g77@exe_ext@
%{_prefix}/bin/@target_alias@-g77%{_exeext}
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771%{_exeext}
+6 -6
View File
@@ -16,12 +16,12 @@ This is gcc and newlib C Library for @target_alias@.
%doc %{_prefix}/man/man1/@target_alias@-gcc.1
%doc %{_prefix}/man/man1/@target_alias@-g++.1
%{_prefix}/bin/@target_alias@-cpp@exe_ext@
%{_prefix}/bin/@target_alias@-c++@exe_ext@
%{_prefix}/bin/@target_alias@-g++@exe_ext@
%{_prefix}/bin/@target_alias@-gcc@exe_ext@
%{_prefix}/bin/@target_alias@-protoize@exe_ext@
%{_prefix}/bin/@target_alias@-unprotoize@exe_ext@
%{_prefix}/bin/@target_alias@-cpp%{_exeext}
%{_prefix}/bin/@target_alias@-c++%{_exeext}
%{_prefix}/bin/@target_alias@-g++%{_exeext}
%{_prefix}/bin/@target_alias@-gcc%{_exeext}
%{_prefix}/bin/@target_alias@-protoize%{_exeext}
%{_prefix}/bin/@target_alias@-unprotoize%{_exeext}
%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
+3 -3
View File
@@ -14,8 +14,8 @@ This is the gcc/java compiler for @target_alias@
%files -n @target_alias@-gcj -f build/files.gcj
%dir %{_prefix}/bin
%{_prefix}/bin/@target_alias@-gcj@exe_ext@
%{_prefix}/bin/@target_alias@-gcj%{_exeext}
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1%{_exeext}
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain%{_exeext}
+1 -1
View File
@@ -13,5 +13,5 @@ RTEMS is an open source operating system for embedded systems.
This is the gcc/objc compiler for @target_alias@
%files -n @target_alias@-objc -f build/files.objc
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj%{_exeext}
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc