Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ChangeLog
View File

@@ -1,3 +1,21 @@
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}.
2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gdb/gdb.add: Remove header, broken cdn-X configuration, * gdb/gdb.add: Remove header, broken cdn-X configuration,

10
scripts/gccnewlib/Makefile.am
View File

@@ -5,8 +5,11 @@
MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
SUBPACKAGES = gccnewlib.add \ SUBPACKAGES = header.add
base-gcc.add target-gcc.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-chill.add target-chill.add \
base-g77.add target-g77.add \ base-g77.add target-g77.add \
base-gcj.add target-gcj.add \ base-gcj.add target-gcj.add \
@@ -17,7 +20,8 @@ gccnewlib.spec.in: $(SUBPACKAGES)
| sed -e 's%@GCCLANGS@%%g' > $@ | sed -e 's%@GCCLANGS@%%g' > $@
CLEANFILES = gccnewlib.spec.in 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 $^ \ cat $^ \
| sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@ | sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@
CLEANFILES += gccnewlib_c_only.spec.in CLEANFILES += gccnewlib_c_only.spec.in

2
scripts/gccnewlib/base-gcc.add
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 %doc %{_prefix}/info/libm.info*.gz
%dir %{_prefix}/bin %dir %{_prefix}/bin
%{_prefix}/bin/gcov@exe_ext@ %{_prefix}/bin/gcov%{_exeext}
%dir %{_prefix}/man %dir %{_prefix}/man
%dir %{_prefix}/man/man1 %dir %{_prefix}/man/man1

6
scripts/gccnewlib/base-gcj.add
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 %files -n rtems-base-gcj
%dir %{_prefix}/bin %dir %{_prefix}/bin
%{_prefix}/bin/jcf-dump@exe_ext@ %{_prefix}/bin/jcf-dump%{_exeext}
%{_prefix}/bin/jv-scan@exe_ext@ %{_prefix}/bin/jv-scan%{_exeext}
%{_prefix}/bin/gcjh@exe_ext@ %{_prefix}/bin/gcjh%{_exeext}

31
scripts/gccnewlib/gccnewlib.add
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 Name: @target_alias@-gcc-newlib
Summary: gcc and newlib C Library for @target_alias@. Summary: gcc and newlib C Library for @target_alias@.
Group: rtems Group: rtems
@@ -72,12 +60,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%build %build
cd build cd build
# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it. ../gcc-@gcc_version@/configure \
%if "%{target_os}" != "%{build_os}" --target=@target_alias@ \
CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
%endif
../gcc-@gcc_version@/configure $CONFIGURE_ARGS --target=@target_alias@ \
--with-gnu-as --with-gnu-ld --with-newlib --verbose \ --with-gnu-as --with-gnu-ld --with-newlib --verbose \
--enable-threads --prefix=%{_prefix} @GCCLANGS@ --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. # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
# Rename it to target_alias-cpp # 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 then
mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@ \ mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
$RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp@exe_ext@ $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp%{_exeext}
fi fi
# gzip info files # gzip info files
@@ -149,8 +133,3 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
esac esac
done done
%clean
# let rpm --clean remove BuildRoot iif using the default BuildRoot
test "$RPM_BUILD_ROOT" = "%{_tmppath}/%{name}" && \
rm -rf $RPM_BUILD_ROOT

4
scripts/gccnewlib/target-g77.add
View File

@@ -14,6 +14,6 @@ This is the gcc/g77 compiler for @target_alias@
%files -n @target_alias@-g77 -f build/files.g77 %files -n @target_alias@-g77 -f build/files.g77
%dir %{_prefix}/bin %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}

12
scripts/gccnewlib/target-gcc.add
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@-gcc.1
%doc %{_prefix}/man/man1/@target_alias@-g++.1 %doc %{_prefix}/man/man1/@target_alias@-g++.1
%{_prefix}/bin/@target_alias@-cpp@exe_ext@ %{_prefix}/bin/@target_alias@-cpp%{_exeext}
%{_prefix}/bin/@target_alias@-c++@exe_ext@ %{_prefix}/bin/@target_alias@-c++%{_exeext}
%{_prefix}/bin/@target_alias@-g++@exe_ext@ %{_prefix}/bin/@target_alias@-g++%{_exeext}
%{_prefix}/bin/@target_alias@-gcc@exe_ext@ %{_prefix}/bin/@target_alias@-gcc%{_exeext}
%{_prefix}/bin/@target_alias@-protoize@exe_ext@ %{_prefix}/bin/@target_alias@-protoize%{_exeext}
%{_prefix}/bin/@target_alias@-unprotoize@exe_ext@ %{_prefix}/bin/@target_alias@-unprotoize%{_exeext}
%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include %dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include

6
scripts/gccnewlib/target-gcj.add
View File

@@ -14,8 +14,8 @@ This is the gcc/java compiler for @target_alias@
%files -n @target_alias@-gcj -f build/files.gcj %files -n @target_alias@-gcj -f build/files.gcj
%dir %{_prefix}/bin %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@/jc1%{_exeext}
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@ %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain%{_exeext}

2
scripts/gccnewlib/target-objc.add
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@ This is the gcc/objc compiler for @target_alias@
%files -n @target_alias@-objc -f build/files.objc %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 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc

14
scripts/rtemsdoc/Makefile.am
View File

@@ -30,7 +30,11 @@ DOCS += networking porting new_chapters
DOCS += relnotes rgdb_specs rtems_gdb DOCS += relnotes rgdb_specs rtems_gdb
DOCS += started started_ada DOCS += started started_ada
SUBPACKAGES = $(DOCS:%=%-docs.add) SUBPACKAGES = header.add
SUBPACKAGES += ../common/common.add
SUBPACKAGES += rtemsdoc.add
SUBPACKAGES += ../common/clean.add
SUBPACKAGES += $(DOCS:%=%-docs.add)
CLEANFILES += $(DOCS:%=%-docs.add) CLEANFILES += $(DOCS:%=%-docs.add)
SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add) SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add)
CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add) CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add)
@@ -45,9 +49,13 @@ SUFFIXES = -supplement.add -docs.add
t=`echo $@ | sed -e 's,-docs.add,,'`; \ t=`echo $@ | sed -e 's,-docs.add,,'`; \
sed -e s/@target\@/$$t/g < $< >$@ sed -e s/@target\@/$$t/g < $< >$@
rtemsdoc.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES += rtemsdoc.spec.in
rtemsdoc.spec: $(MKSPEC_DEPS) $(SUBPACKAGES) rtemsdoc.spec: $(MKSPEC_DEPS) $(SUBPACKAGES)
$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . > $@ $(MKSPEC) -cfg $(top_builddir)/setup.cache > $@
cat $(SUBPACKAGES) >> $@ CLEANFILES += rtemsdoc.spec
RPM_SPECS_DATA = rtemsdoc.spec RPM_SPECS_DATA = rtemsdoc.spec

2
scripts/rtemsdoc/mkspec.in
View File

@@ -4,7 +4,6 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
CFG=../setup.cache CFG=../setup.cache
exe_ext=@EXEEXT@
usage() usage()
{ {
@@ -49,5 +48,4 @@ sed -e "s%@PACKAGE_BUGREPORT\@%@PACKAGE_BUGREPORT@%g" \
-e "s%@rtems_version\@%${rtems_version}%g" \ -e "s%@rtems_version\@%${rtems_version}%g" \
-e "s%@rtems_rpm_version\@%${rtems_rpm_version}%g" \ -e "s%@rtems_rpm_version\@%${rtems_rpm_version}%g" \
-e "s,@rpm_build_root\@,${rpm_build_root},g" \ -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-e "s%@exe_ext\@%${exe_ext}%g" \
< ${specsrc} < ${specsrc}

100
scripts/rtemsdoc/rtemsdoc.spec.in
View File

@@ -1,100 +0,0 @@
#
# spec file for package rtemsdoc
#
# Copyright (c) 2003 Ralf Corsepius, Ulm, Germany
#
# please send bugfixes or comments to @PACKAGE_BUGREPORT@
#
%define _prefix /opt/rtems
%define _datadir %{_prefix}/share
%define _infodir %{_datadir}/info
%define srcvers @rtems_version@
%define rpmvers %{expand:%%(echo @rtems_version@ | tr - _ )}
Vendor: OAR Corporation
Distribution: Linux
Name: rtemsdoc
Release: @rtems_rpm_release@
License: Distributable
Group: rtems
Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
BuildPreReq: texinfo >= 4.2
BuildPreReq: tetex
BuildPreReq: perl
BuildPreReq: gcc
Version: %{rpmvers}
Summary: A free operating system for embedded systems
Source: rtems-%{srcvers}.tar.bz2
#
# The original sources are not included in the source RPM.
# If we included them, then the source RPMs for each target
# would duplicate MBs of source unnecessarily. This is
# a duplication of over 30 MBs of source for each of
# the more than 10 targets it is possible to build.
#
# You can get them yourself from the Internet and copy them to
# your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
# Or you can try the ftp options of rpm :-)
#
NoSource: 0
Prefix: %{_prefix}
Prefix: %{_infodir}
Prefix: %{_datadir}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
%description
RTEMS is a free operating system for embedded systems.
This package contains the documentation
%prep
%setup -c -T -n %{name}-%{version} -b0
test -d build || mkdir build
%build
cd build
# rtems does not support building inside the source tree
export PATH=%{_prefix}/bin:$PATH
../rtems-%{srcvers}/doc/configure \
--prefix=%{_prefix} \
--infodir=%{_infodir} \
--datadir=%{_datadir} \
--enable-docs
make RTEMS_BSP=
%install
rm -rf ${RPM_BUILD_ROOT}
cd build
make RTEMS_BSP= DESTDIR=${RPM_BUILD_ROOT} install
rm -f ${RPM_BUILD_ROOT}/%{_infodir}/template*
rm -f ${RPM_BUILD_ROOT}/%{_datadir}/rtems/*/template*
rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/html/supplements/template*
gzip -9qf ${RPM_BUILD_ROOT}/%{_infodir}/*
bzip2 -9qf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/ps/*
## base
%package base
Summary: Documentation for RTEMS ada support
Group: rtems/documentation
%description base
RTEMS is a free operating system for embedded systems.
This package contains the files shared between different documentation
packages.
%files base
%dir %{_infodir}
%dir %{_datadir}/rtems
%dir %{_datadir}/rtems/html
%{_datadir}/rtems/html/images
%{_datadir}/rtems/html/*.html