summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-27 23:49:44 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-27 23:49:44 +0000
commit42ec72d35c6381104f9147ed3d6d3e983adb705f (patch)
tree994f8f7e99508a30c8097000ed1d745a9dff3d72
parentf82fee97bb8d5429547aeb04d6812fae2610119f (diff)
downloadrtems-42ec72d35c6381104f9147ed3d6d3e983adb705f.tar.bz2
Removed gnat and made final cleanup.
-rw-r--r--scripts/Makefile.am3
-rw-r--r--scripts/binutils/binutils.spec.in7
-rw-r--r--scripts/configure.in4
-rw-r--r--scripts/gccnewlib/Makefile.am5
-rw-r--r--scripts/gccnewlib/gccnewlib_c_only.spec.in45
-rwxr-xr-xscripts/mkbinutils_subpackage_version187
-rw-r--r--scripts/mkgnatnewlibspec.in64
-rw-r--r--scripts/setup.def4
8 files changed, 50 insertions, 269 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index fcb851094a..6cf5e015a2 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,16 +1,13 @@
AUTOMAKE_OPTIONS = foreign
-# add gnatnewlib once that one works. :)
SUBDIRS = . binutils gccnewlib gdb rtems
noinst_SCRIPTS = \
setup \
buildall \
-mkbinutils_subpackage_version \
mkbinutilspec \
mkbspspec \
mkgccnewlibspec \
-mkgnatnewlibspec \
mkgdbspec \
mkrpms \
mkspec
diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index 2795d11a09..e336ebb94d 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -105,6 +105,13 @@ Authors:
touch ../files
fi
+# We assume that info/dir exists when building the RPMs
+ rm -f $RPM_BUILD_ROOT/opt/rtems/info/dir
+ f=`find $RPM_BUILD_ROOT/opt/rtems/info -name '*.info.gz'`
+ test x"$f" != x"" && for i in $f; do
+ install-info $i $RPM_BUILD_ROOT/opt/rtems/info/dir
+ done
+
%post
if test -d $RPM_INSTALL_PREFIX/rtems/info;
then
diff --git a/scripts/configure.in b/scripts/configure.in
index 187e9f7667..95f1f8cdb4 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -1,7 +1,7 @@
## $Id$
AC_INIT(binutils)
-AM_INIT_AUTOMAKE(scripts,20000124-0,no)
+AM_INIT_AUTOMAKE(scripts,20000125-0,no)
AC_EXEEXT
@@ -43,12 +43,10 @@ Makefile
buildall
mkbinutilspec
mkgccnewlibspec
-mkgnatnewlibspec
mkgdbspec
mkbspspec
binutils/Makefile
gccnewlib/Makefile
-gnatnewlib/Makefile
gdb/Makefile
rtems/Makefile
)
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index b56767434f..38102acae9 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -8,6 +8,9 @@ C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in
MKGCCNEWLIBSPEC_DEPS = \
$(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
+MKGCCNEWLIB_C_ONLY_SPEC_DEPS = \
+ $(top_builddir)/mkgccnewlibspec gccnewlib_c_only.spec.in \
+ $(top_builddir)/setup.cache
hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
@@ -15,7 +18,7 @@ hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
-i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS)
$(MKGCCNEWLIBSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache -o . i960-rtems
m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
diff --git a/scripts/gccnewlib/gccnewlib_c_only.spec.in b/scripts/gccnewlib/gccnewlib_c_only.spec.in
index 4f0fd44a5d..85b326c9d8 100644
--- a/scripts/gccnewlib/gccnewlib_c_only.spec.in
+++ b/scripts/gccnewlib/gccnewlib_c_only.spec.in
@@ -1,5 +1,5 @@
#
-# spec file for building gcc for rtems
+# spec file for building gcc (C Only) for rtems
#
# Copyright (c) 1999 OARCorp, Huntsville, AL
#
@@ -14,7 +14,7 @@ Group: rtems
Release: @Release@
Copyright: 1999 OARCorp
-Provides: @target_alias@-gcc
+Provides: rtems-base-gcc @target_alias@-gcc
Requires: @target_alias@-binutils
Autoreqprov: on
@@ -55,6 +55,26 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
Or you can try the ftp options of rpm :-)
+%package -n rtems-base-gcc
+Summary: base package for rtems gcc and newlib C Library
+Group: rtems
+
+%description -n rtems-base-gcc
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the files for gcc and newlib that are shared by all targets.
+
+%package -n @target_alias@-gcc
+Summary: rtems gcc and newlib C Library for @target_alias@
+Group: rtems
+Requires: @target_alias@-binutils rtems-base-gcc
+
+%description -n @target_alias@-gcc
+RTEMS is an open source operating system for embedded systems.
+
+This is gcc and newlib C Library for @target_alias@.
+
%prep
# untar the sources inside @target_alias@-gcc-newlib
%setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
@@ -122,23 +142,32 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
esac
done
-%files -f build/files.gcc
+
+
+%files -n rtems-base-gcc
%dir /opt/rtems/info
-%doc /opt/rtems/info/dir
+# %doc /opt/rtems/info/dir
%doc /opt/rtems/info/cpp.info*
%doc /opt/rtems/info/gcc.info*
%doc /opt/rtems/info/libc.info*
%doc /opt/rtems/info/libm.info*
+%dir /opt/rtems/bin
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+
%dir /opt/rtems/man
%dir /opt/rtems/man/man1
%doc /opt/rtems/man/man1/cccp.1
+
+%dir /opt/rtems/include
+/opt/rtems/include/g++-3
+
+%files -n @target_alias@-gcc -f build/files.gcc
+
%doc /opt/rtems/man/man1/@target_alias@-gcc.1
%doc /opt/rtems/man/man1/@target_alias@-g++.1
-%dir /opt/rtems/bin
-/opt/rtems/bin/cpp@exe_ext@
-/opt/rtems/bin/gcov@exe_ext@
/opt/rtems/bin/@target_alias@-c++@exe_ext@
/opt/rtems/bin/@target_alias@-g++@exe_ext@
/opt/rtems/bin/@target_alias@-gcc@exe_ext@
@@ -147,8 +176,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
-%dir /opt/rtems/include
-/opt/rtems/include/g++-3
/opt/rtems/@target_alias@
%post
diff --git a/scripts/mkbinutils_subpackage_version b/scripts/mkbinutils_subpackage_version
deleted file mode 100755
index 00f42fe928..0000000000
--- a/scripts/mkbinutils_subpackage_version
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/bin/sh
-#
-# Usage: mktoolspec CPU
-#
-
-RTEMS_DIR=`dirname $0`
-RTEMS_VERSION=`grep Version ${RTEMS_DIR}/../VERSION | \
-sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'`
-
-# target_alias=$1
-TARGETS="i386-rtems sparc-rtems"
-# should be $*
-
-release=0
-
-# Some linux distributions use /usr/src/packages
-# redhat uses /usr/src/redhat
-# others might use /usr/src
-if test -d /usr/src/packages/SPECS;
-then
-dst=/usr/src/packages/SPECS;
-elif test -d /usr/src/redhat/SPECS;
- then
-dst=/usr/src/redhat/SPECS;
-elif test -d /usr/src/SPECS/;
-then
-dst=/usr/src/SPECS;
-fi
-
-# sed -e "s%@Version@%${RTEMS_VERSION}%g" \
-# -e "s%@bsp@%${bsp}%g" \
-# -e "s%@Release@%${release}%g" \
-# -e "s%@target_alias@%${target_alias}%g" \
-# < ${RTEMS_DIR}/binutils.spec.in \
-# > ${dst}/$target_alias-binutils.spec
-
-(
-echo "#"
-echo "# spec file for package rtems"
-echo "# "
-echo "# Copyright (c) 1999 OARCorp, Huntsville, AL"
-echo "#"
-echo "# please send bugfixes or comments to joel@OARcorp.com"
-echo "#"
-echo ""
-# echo "# neededforbuild @target_alias@-binutils @target_alias@-gcc"
-echo ""
-echo "Vendor: OAR Corporation"
-echo "Distribution: Linux"
-echo "Name: rtems-binutils"
-echo "Release: ${release}"
-echo "Copyright: 1999 OARCorp"
-echo "Group: unsorted"
-echo "Provides: binutils for RTEMS"
-echo ""
-echo "Autoreqprov: on"
-echo "Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com"
-echo ""
-echo "Version: ${RTEMS_VERSION}"
-echo "Summary: binutils for RTEMS"
-echo "Source0: binutils-990901.tar.gz"
-echo "Patch0: binutils-990901-rtems-19991015.diff"
-echo ""
-echo "Buildroot: /tmp"
-echo "# Patch:"
-echo "%description"
-echo "RTEMS is an open source operating system for embedded systems."
-echo ""
-echo "This is the GNU binutils for RTEMS targetting ${target_alias}."
-echo ""
-echo "Authors:"
-echo "--------"
-echo " Joel Sherrill (joel@oarcorp.com)"
-echo " ..."
-echo ""
-
-#
-# This has to be unrolled in the file
-for target_alias in ${TARGETS}
-do
- echo "%package ${target_alias}"
- echo "Summary: binutils for ${target_alias}"
- echo "Group: unsorted"
- echo ""
- echo "%description ${target_alias}"
- echo "binutils for ${target_alias}"
- echo ""
-done
-
-echo "%prep"
- echo "# untar the sources inside binutils-rtems"
- echo "%setup -c -n binutils-rtems -a 0"
- echo ""
- echo "%patch0 -p0"
- echo ""
-
-echo "%build"
- echo "if [ X\${RTEMS_RPM_TARGETS} = X ] ; then"
- echo " RTEMS_RPM_TARGETS=\"${TARGETS}\""
- echo "fi"
- echo ""
- echo "for target_alias in \${RTEMS_RPM_TARGETS}"
- echo "do"
- echo " test -d build-\${target_alias} || mkdir build-\${target_alias}"
- echo " ( cd build-\${target_alias}"
- echo " ../binutils-990901/configure --target=\${target_alias} \\"
- echo " --verbose --prefix=/opt/rtems "
- echo ""
- echo " test -d $RPM_BUILD_ROOT/opt \\"
- echo " || mkdir $RPM_BUILD_ROOT/opt"
- echo " test -d $RPM_BUILD_ROOT/opt/rtems \\"
- echo " || mkdir $RPM_BUILD_ROOT/opt/rtems"
- echo ""
- echo " make all"
- echo " make info"
- echo " )"
- echo "done"
- echo ""
-
-echo "%install"
- echo "if [ X\${RTEMS_RPM_TARGETS} = X ] ; then"
- echo " RTEMS_RPM_TARGETS=\"${TARGETS}\""
- echo "fi"
- echo ""
- echo "for target_alias in \${RTEMS_RPM_TARGETS}"
- echo "do"
- echo " ( cd build-\${target_alias}"
- echo " make prefix=\${RPM_BUILD_ROOT}/opt/rtems install"
- echo " make prefix=\${RPM_BUILD_ROOT}/opt/rtems install-info"
- echo " )"
- echo "done"
- echo ""
-
-for target_alias in ${TARGETS}
-do
- echo "%files ${target_alias}"
- echo "%doc /opt/rtems/info/as.info*"
- echo "%doc /opt/rtems/info/bfd.info*"
- echo "%doc /opt/rtems/info/binutils.info*"
- echo "%doc /opt/rtems/info/ld.info*"
- echo "%doc /opt/rtems/info/standards.info*"
- echo "%doc /opt/rtems/man/man1/${target_alias}-ar.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-nm.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-objdump.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-ranlib.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-size.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-strings.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-strip.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-objcopy.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-addr2line.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-nlmconv.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-c++filt.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-as.1"
- echo "%doc /opt/rtems/man/man1/${target_alias}-ld.1"
- echo ""
- echo "/opt/rtems/bin/${target_alias}-addr2line"
- echo "/opt/rtems/bin/${target_alias}-ar"
- echo "/opt/rtems/bin/${target_alias}-as"
- echo "/opt/rtems/bin/${target_alias}-c++filt"
- echo "/opt/rtems/bin/${target_alias}-gasp"
- echo "/opt/rtems/bin/${target_alias}-ld"
- echo "/opt/rtems/bin/${target_alias}-nm"
- echo "/opt/rtems/bin/${target_alias}-objcopy"
- echo "/opt/rtems/bin/${target_alias}-objdump"
- echo "/opt/rtems/bin/${target_alias}-ranlib"
- echo "/opt/rtems/bin/${target_alias}-readelf"
- echo "/opt/rtems/bin/${target_alias}-size"
- echo "/opt/rtems/bin/${target_alias}-strings"
- echo "/opt/rtems/bin/${target_alias}-strip"
- echo "/opt/rtems/include/bfd.h"
- echo "/opt/rtems/include/ansidecl.h"
- echo "/opt/rtems/include/bfdlink.h"
- echo "/opt/rtems/lib/libbfd*"
- echo "/opt/rtems/lib/libiberty*"
- echo "/opt/rtems/lib/libopcodes*"
- echo "/opt/rtems/${target_alias}/bin/ar"
- echo "/opt/rtems/${target_alias}/bin/as"
- echo "/opt/rtems/${target_alias}/bin/ld"
- echo "/opt/rtems/${target_alias}/bin/nm"
- echo "/opt/rtems/${target_alias}/bin/ranlib"
- echo "/opt/rtems/${target_alias}/bin/strip"
- echo "/opt/rtems/${target_alias}/lib/ldscripts"
- echo ""
-done
-) > ${dst}/rtems-binutils.spec
-
-echo Generated ${dst}/rtems-binutils.spec.
diff --git a/scripts/mkgnatnewlibspec.in b/scripts/mkgnatnewlibspec.in
deleted file mode 100644
index 16cdc73545..0000000000
--- a/scripts/mkgnatnewlibspec.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# Usage: mktoolspec CPU
-#
-
-RTEMS_DIR=`dirname $0`/@top_srcdir@
-
-CFG=setup.cache
-dst=@RPM_SPECSdir@
-exe_ext=@EXEEXT@
-
-usage()
-{
- echo "$0 [options] <target_alias>"
- echo " options:"
- echo " -cfg <setup.cache>"
- echo " -o <rpm-spec-dir>"
- exit 1 ;
-}
-
-while test $# -ge 2; do
-case $1 in
--cfg)
- shift
- CFG=$1
- shift
- ;;
--o)
- shift
- dst=$1
- shift
- ;;
--*)
- echo "invalid option $1";
- usage
- ;;
-esac
-done
-
-if test ! $# -eq 1;
-then
- echo "Invalid number of arguments"
- usage
-fi
-
-# target to build for
-target_alias=$1
-
-. ./$CFG
-
-specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec
-
-sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \
- -e "s%@target_alias@%${target_alias}%g" \
- -e "s%@rpm_build_root@%${rpm_build_root}%g" \
- -e "s%@gcc_version@%${gcc_version}%g" \
- -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
- -e "s%@newlib_version@%${newlib_version}%g" \
- -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
- -e "s%@exe_ext@%${exe_ext}%g" \
-< ${RTEMS_DIR}/gccnewlib/gccnewlib.spec.in \
-> ${specfile}
-
-echo Generated ${specfile}.
diff --git a/scripts/setup.def b/scripts/setup.def
index 799b8a274b..e2ded8510b 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -8,8 +8,8 @@ gcc_version=2.95.2
gcc_patch_version=20000106
gccnewlib_rpm_release=2
gdb_version=4.18
-gdb_patch_version=20000107
-gdb_rpm_release=1
+gdb_patch_version=20000126
+gdb_rpm_release=2
rtems_version=19991117
rtems_rpm_release=1
rpm_build_root=/tmp