summaryrefslogtreecommitdiffstats
path: root/scripts-ada
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-13 16:35:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-13 16:35:55 +0000
commit1e3f4633a0f54977134a9b803e1737c4eac25cd5 (patch)
tree95c425ab2770177f5820dc7b297c1ad31f415a26 /scripts-ada
parenta8bd1dea77a27cabb59afe9621ad5649b18cd8ab (diff)
downloadrtems-1e3f4633a0f54977134a9b803e1737c4eac25cd5.tar.bz2
2001-09-13 Joel Sherrill <joel@OARcorp.com>
* configure.in: Add RTEMS specific version of EXEEXT test. * mkgdbspec.in, mkgnatnewlibspec.in, gdb/gdb.spec.in, gnatnewlib/gnatnewlib.spec.in: Change to Target_alias to avoid conflicts with new autoconf/automake. * setup, setup.def, mkgnatnewlibspec.in: Add gnat_newlib_patch_version variable. * gnatnewlib/Makefile.am: Add i386-rtemscoff target in attempt to build it.
Diffstat (limited to 'scripts-ada')
-rw-r--r--scripts-ada/ChangeLog11
-rw-r--r--scripts-ada/configure.in10
-rw-r--r--scripts-ada/gdb/gdb.spec.in28
-rw-r--r--scripts-ada/gnatnewlib/Makefile.am7
-rw-r--r--scripts-ada/gnatnewlib/gnatnewlib.spec.in152
-rw-r--r--scripts-ada/mkgdbspec.in2
-rw-r--r--scripts-ada/mkgnatnewlibspec.in3
-rwxr-xr-xscripts-ada/setup51
-rw-r--r--scripts-ada/setup.def3
9 files changed, 148 insertions, 119 deletions
diff --git a/scripts-ada/ChangeLog b/scripts-ada/ChangeLog
index d9593a8c44..8fc191a420 100644
--- a/scripts-ada/ChangeLog
+++ b/scripts-ada/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-13 Joel Sherrill <joel@OARcorp.com>
+
+ * configure.in: Add RTEMS specific version of EXEEXT test.
+ * mkgdbspec.in, mkgnatnewlibspec.in, gdb/gdb.spec.in,
+ gnatnewlib/gnatnewlib.spec.in: Change to Target_alias to avoid
+ conflicts with new autoconf/automake.
+ * setup, setup.def, mkgnatnewlibspec.in: Add gnat_newlib_patch_version
+ variable.
+ * gnatnewlib/Makefile.am: Add i386-rtemscoff target in attempt to
+ build it.
+
2001-08-16 Joel Sherrill <joel@OARcorp.com>
* setup.def, gnatnewlib/gnatnewlib.spec.in: Modified to properly
diff --git a/scripts-ada/configure.in b/scripts-ada/configure.in
index 69be27c82b..95233ba2f3 100644
--- a/scripts-ada/configure.in
+++ b/scripts-ada/configure.in
@@ -3,7 +3,15 @@
AC_INIT(binutils)
AM_INIT_AUTOMAKE(rtems-scripts_ada,20000125-0,no)
-AC_EXEEXT
+# Check for .exe suffix.
+# With autoconf > 2.13 AC_EXEEXT is not what we want to use.
+AC_MSG_CHECKING([for executable suffix])
+case "$host" in
+i?86-*cygwin*)
+ EXEEXT=.exe ;;
+esac
+AC_SUBST(EXEEXT)
+AC_MSG_RESULT([$EXEEXT])
test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
. ./setup.cache
diff --git a/scripts-ada/gdb/gdb.spec.in b/scripts-ada/gdb/gdb.spec.in
index 6ec5f33dd4..83b1773252 100644
--- a/scripts-ada/gdb/gdb.spec.in
+++ b/scripts-ada/gdb/gdb.spec.in
@@ -10,17 +10,17 @@
Vendor: OAR Corporation
Distribution: Linux
-Name: @target_alias@-gnat-gdb-collection
+Name: @Target_alias@-gnat-gdb-collection
Release: @Release@
License: GPL/LGPL
Group: gnatrtems
-Provides: rtems-base-gnat-gdb @target_alias@-gnat-gdb
+Provides: rtems-base-gnat-gdb @Target_alias@-gnat-gdb
Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
Version: gnat@gnat_version@
-Summary: gdb for target @target_alias@
+Summary: gdb for target @Target_alias@
Source0: ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
Source1: ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@-src.tar.gz
Patch0: gdb-@gdb_version@-rtems-gnat-@gnat_version@-@gdb_patch_version@.diff
@@ -43,7 +43,7 @@ NoSource: 1
%description
RTEMS is an open source operating system for embedded systems.
-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting @Target_alias@.
%package -n rtems-base-gnat-gdb
Summary: base package for rtems gdb
@@ -55,16 +55,16 @@ RTEMS is an open source operating system for embedded systems.
This is the base for gdb regardless of target CPU.
-%package -n @target_alias@-gnat-gdb
-Summary: rtems gdb for @target_alias@
+%package -n @Target_alias@-gnat-gdb
+Summary: rtems gdb for @Target_alias@
Group: rtems
Requires: rtems-base-gnat-gdb
-%description -n @target_alias@-gnat-gdb
+%description -n @Target_alias@-gnat-gdb
RTEMS is an open source operating system for embedded systems.
-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting @Target_alias@.
Authors:
--------
@@ -74,8 +74,8 @@ Authors:
%prep
echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
-# untar the sources inside @target_alias@-gnat-gdb
-%setup -c -n @target_alias@-gnat-gdb -a 0 -a 1
+# untar the sources inside @Target_alias@-gnat-gdb
+%setup -c -n @Target_alias@-gnat-gdb -a 0 -a 1
cd gdb-@gdb_version@
patch -p0 <../gnat-@gnat_version@-src/src/gdb-@gdb_version@.gnat.diff
@@ -85,7 +85,7 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
%build
test -d build || mkdir build
cd build
- ../gdb-@gdb_version@/configure --target=@target_alias@ \
+ ../gdb-@gdb_version@/configure --target=@Target_alias@ \
--verbose --prefix=/opt/gnatrtems @extra_configure_arguments@
make CC=gcc CFLAGS="-O2 -g -DRTEMS_TARGET" all
@@ -144,9 +144,9 @@ test -d build || mkdir build
# We use libiberty from gcc
# /opt/gnatrtems/lib/libiberty*
-%files -n @target_alias@-gnat-gdb
-%doc /opt/gnatrtems/man/man1/@target_alias@-gdb.1
+%files -n @Target_alias@-gnat-gdb
+%doc /opt/gnatrtems/man/man1/@Target_alias@-gdb.1
%dir /opt/gnatrtems/bin
-/opt/gnatrtems/bin/@target_alias@-gdb@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-gdb@exe_ext@
diff --git a/scripts-ada/gnatnewlib/Makefile.am b/scripts-ada/gnatnewlib/Makefile.am
index 52232e9c4d..55203624cf 100644
--- a/scripts-ada/gnatnewlib/Makefile.am
+++ b/scripts-ada/gnatnewlib/Makefile.am
@@ -7,6 +7,9 @@ MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec
MKGNATNEWLIBSPEC_DEPS = $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in \
$(top_builddir)/setup.cache
+i386-rtemscoff-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
+ $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtemscoff
+
powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -15,7 +18,9 @@ sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
TEMPLATES = gnatnewlib.spec.in
-RPM_SPECS_DATA = powerpc-rtems-$(GNATNEWLIBVERS).spec \
+RPM_SPECS_DATA = \
+ i386-rtemscoff-$(GNATNEWLIBVERS).spec \
+ powerpc-rtems-$(GNATNEWLIBVERS).spec \
sparc-rtems-$(GNATNEWLIBVERS).spec
noinst_DATA = $(TEMPLATES)
diff --git a/scripts-ada/gnatnewlib/gnatnewlib.spec.in b/scripts-ada/gnatnewlib/gnatnewlib.spec.in
index 5462ca17ef..ad6fc02913 100644
--- a/scripts-ada/gnatnewlib/gnatnewlib.spec.in
+++ b/scripts-ada/gnatnewlib/gnatnewlib.spec.in
@@ -8,15 +8,15 @@
Vendor: OAR Corporation
Distribution: Linux
-Name: @target_alias@-gnat-newlib
-Summary: gnat, gcc, and newlib C Library for @target_alias@.
+Name: @Target_alias@-gnat-newlib
+Summary: gnat, gcc, and newlib C Library for @Target_alias@.
Group: gnatrtems
Release: @Release@
License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
-Provides: rtems-base-gnat @target_alias@-gnat
-Provides: rtems-base-gnat-binutils @target_alias@-gnat-binutils
-# Requires: @target_alias@-binutils
+Provides: rtems-base-gnat @Target_alias@-gnat
+Provides: rtems-base-gnat-binutils @Target_alias@-gnat-binutils
+# Requires: @Target_alias@-binutils
Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
@@ -30,7 +30,7 @@ Patch0: gcc-@gcc_version@-rtems-gnat-@gnat_version@-@gcc_patch_version@.diff
Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
Patch2: gnat-@gnat_version@-rtems-@gnat_patch_version@.diff
Patch3: binutils-@binutils_version@-rtems-gnat-@gnat_version@-@binutils_patch_version@.diff
-Patch4: newlib-@newlib_version@-rtems-gnat-@gnat_version@-@newlib_patch_version@.diff
+Patch4: newlib-@newlib_version@-rtems-gnat-@gnat_version@-@gnat_newlib_patch_version@.diff
#
Buildroot: /tmp
@@ -94,30 +94,30 @@ RTEMS is an open source operating system for embedded systems.
This is the base for binutils regardless of target CPU.
-%package -n @target_alias@-gnat-binutils
-Summary: rtems binutils for @target_alias@
+%package -n @Target_alias@-gnat-binutils
+Summary: rtems binutils for @Target_alias@
Group: gnatrtems
Requires: rtems-base-gnat-binutils
-%description -n @target_alias@-gnat-binutils
+%description -n @Target_alias@-gnat-binutils
RTEMS is an open source operating system for embedded systems.
-This is the GNU binutils for RTEMS targetting @target_alias@.
+This is the GNU binutils for RTEMS targetting @Target_alias@.
-%package -n @target_alias@-gnat
-Summary: rtems gnat, gcc, and newlib C Library for @target_alias@
+%package -n @Target_alias@-gnat
+Summary: rtems gnat, gcc, and newlib C Library for @Target_alias@
Group: gnatrtems
-Requires: @target_alias@-gnat-binutils rtems-base-gnat
+Requires: @Target_alias@-gnat-binutils rtems-base-gnat
-%description -n @target_alias@-gnat
+%description -n @Target_alias@-gnat
RTEMS is an open source operating system for embedded systems.
-This is gnat, gcc, and newlib C Library for @target_alias@.
+This is gnat, gcc, and newlib C Library for @Target_alias@.
%prep
-# untar the sources inside @target_alias@-gnat-newlib
-%setup -c -n @target_alias@-gnat-newlib -a 0 -a 1 -a 2 -a 3
+# untar the sources inside @Target_alias@-gnat-newlib
+%setup -c -n @Target_alias@-gnat-newlib -a 0 -a 1 -a 2 -a 3
%patch0 -p0
%patch2 -p0
@@ -178,7 +178,7 @@ cd ..
cd build
# after we switch off gcc 2.8.1, configure using gcc not a src directory
# and build binutils separately.
- ../src/configure --target=@target_alias@ \
+ ../src/configure --target=@Target_alias@ \
--with-gnu-as --with-gnu-ld --with-newlib --verbose \
--prefix=/opt/gnatrtems
@@ -186,10 +186,10 @@ cd ..
# '--enable-languages=c,c++'
# # This is a hack that is only because gnat still uses gcc 2.8.1
-# test -d ${RPM_BUILD_ROOT}/opt/gnatrtems/@target_alias@ ||
-# mkdir -p ${RPM_BUILD_ROOT}/opt/gnatrtems/@target_alias@
-# for dir in ${RPM_BUILD_ROOT}/opt/gnatrtems/@target_alias@/include \
-# ${RPM_BUILD_ROOT}/opt/gnatrtems/@target_alias@/sys-include
+# test -d ${RPM_BUILD_ROOT}/opt/gnatrtems/@Target_alias@ ||
+# mkdir -p ${RPM_BUILD_ROOT}/opt/gnatrtems/@Target_alias@
+# for dir in ${RPM_BUILD_ROOT}/opt/gnatrtems/@Target_alias@/include \
+# ${RPM_BUILD_ROOT}/opt/gnatrtems/@Target_alias@/sys-include
# do
# test -d ${dir} || mkdir -p ${dir}
# cp ../newlib-@newlib_version@/newlib/libc/sys/rtems/include/limits.h ${dir}
@@ -234,9 +234,9 @@ cd ..
%install
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 @target_alias@/bin/gcc
+ # If it doesn't find it, gcc doesn't install @Target_alias@/bin/gcc
# ../gcc-@gcc_version@/mkinstalldirs \
- # $RPM_BUILD_ROOT/opt/gnatrtems/@target_alias@/bin
+ # $RPM_BUILD_ROOT/opt/gnatrtems/@Target_alias@/bin
cd gcc
echo "Starting install of gnat"
@@ -261,7 +261,7 @@ cd ..
rm -f dirs ;
echo "%dir /opt/gnatrtems/lib" >> dirs ;
echo "%dir /opt/gnatrtems/lib/gcc-lib" >> dirs ;
- echo "%dir /opt/gnatrtems/lib/gcc-lib/@target_alias@" >> dirs ;
+ echo "%dir /opt/gnatrtems/lib/gcc-lib/@Target_alias@" >> dirs ;
touch ../files
# if test -f $RPM_BUILD_ROOT/opt/gnatrtems/info/configure.info.gz;
@@ -273,15 +273,15 @@ cd ..
# touch ../files
# fi
# These target specific files are only present in binutils >= 2.9.5
- if test -f /opt/gnatrtems/bin/@target_alias@-readelf@exe_ext@;
+ if test -f /opt/gnatrtems/bin/@Target_alias@-readelf@exe_ext@;
then
- echo /opt/gnatrtems/bin/@target_alias@-readelf@exe_ext@ > ../files.target
+ echo /opt/gnatrtems/bin/@Target_alias@-readelf@exe_ext@ > ../files.target
else
touch ../files.target
fi
# Collect multilib subdirectories
- TGTDIR="$RPM_BUILD_ROOT/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@"
+ TGTDIR="$RPM_BUILD_ROOT/opt/gnatrtems/lib/gcc-lib/@Target_alias@/@gcc_version@"
find $TGTDIR \
\( -type d -a ! -path "$TGTDIR/include*" \) -print | \
sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> dirs
@@ -327,37 +327,37 @@ cd ..
# %dir /opt/gnatrtems/share
# %dir /opt/gnatrtems/share/locale
-%files -n @target_alias@-gnat-binutils -f files.target
-%doc /opt/gnatrtems/man/man1/@target_alias@-*.1
+%files -n @Target_alias@-gnat-binutils -f files.target
+%doc /opt/gnatrtems/man/man1/@Target_alias@-*.1
%dir /opt/gnatrtems/bin
-/opt/gnatrtems/bin/@target_alias@-addr2line@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-ar@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-as@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-c++filt@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-gasp@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-ld@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-nm@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-objcopy@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-objdump@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-ranlib@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-addr2line@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-ar@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-as@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-c++filt@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-gasp@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-ld@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-nm@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-objcopy@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-objdump@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-ranlib@exe_ext@
# readelf is not in older binutils so get it from file list
-# /opt/gnatrtems/bin/@target_alias@-readelf@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-size@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-strings@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-strip@exe_ext@
-
-%dir /opt/gnatrtems/@target_alias@
-%dir /opt/gnatrtems/@target_alias@/bin
-/opt/gnatrtems/@target_alias@/bin/ar@exe_ext@
-/opt/gnatrtems/@target_alias@/bin/as@exe_ext@
-/opt/gnatrtems/@target_alias@/bin/ld@exe_ext@
-/opt/gnatrtems/@target_alias@/bin/nm@exe_ext@
-/opt/gnatrtems/@target_alias@/bin/ranlib@exe_ext@
-/opt/gnatrtems/@target_alias@/bin/strip@exe_ext@
-
-%dir /opt/gnatrtems/@target_alias@/lib
-/opt/gnatrtems/@target_alias@/lib/ldscripts
+# /opt/gnatrtems/bin/@Target_alias@-readelf@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-size@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-strings@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-strip@exe_ext@
+
+%dir /opt/gnatrtems/@Target_alias@
+%dir /opt/gnatrtems/@Target_alias@/bin
+/opt/gnatrtems/@Target_alias@/bin/ar@exe_ext@
+/opt/gnatrtems/@Target_alias@/bin/as@exe_ext@
+/opt/gnatrtems/@Target_alias@/bin/ld@exe_ext@
+/opt/gnatrtems/@Target_alias@/bin/nm@exe_ext@
+/opt/gnatrtems/@Target_alias@/bin/ranlib@exe_ext@
+/opt/gnatrtems/@Target_alias@/bin/strip@exe_ext@
+
+%dir /opt/gnatrtems/@Target_alias@/lib
+/opt/gnatrtems/@Target_alias@/lib/ldscripts
%files -n rtems-base-gnat
%dir /opt/gnatrtems/info
# %doc /opt/gnatrtems/info/dir
@@ -369,7 +369,7 @@ cd ..
# %dir /opt/gnatrtems/man
# %dir /opt/gnatrtems/man/man1
%doc /opt/gnatrtems/man/man1/cccp.1
-%doc /opt/gnatrtems/man/man1/@target_alias@-gcc.1
+%doc /opt/gnatrtems/man/man1/@Target_alias@-gcc.1
%dir /opt/gnatrtems/bin
# /opt/gnatrtems/bin/cpp@exe_ext@
@@ -377,28 +377,28 @@ cd ..
%dir /opt/gnatrtems/include
# /opt/gnatrtems/include/g++-3
-%files -n @target_alias@-gnat -f files.gcc
-/opt/gnatrtems/bin/@target_alias@-gcc@exe_ext@
-/opt/gnatrtems/bin/@target_alias@-gnatbind
-/opt/gnatrtems/bin/@target_alias@-gnatbl
-/opt/gnatrtems/bin/@target_alias@-gnatchop
-/opt/gnatrtems/bin/@target_alias@-gnatfind
-/opt/gnatrtems/bin/@target_alias@-gnatkr
-/opt/gnatrtems/bin/@target_alias@-gnatlink
-/opt/gnatrtems/bin/@target_alias@-gnatls
-/opt/gnatrtems/bin/@target_alias@-gnatmake
-/opt/gnatrtems/bin/@target_alias@-gnatmem
-/opt/gnatrtems/bin/@target_alias@-gnatprep
-/opt/gnatrtems/bin/@target_alias@-gnatpsta
-/opt/gnatrtems/bin/@target_alias@-gnatpsys
-/opt/gnatrtems/bin/@target_alias@-gnatxref
+%files -n @Target_alias@-gnat -f files.gcc
+/opt/gnatrtems/bin/@Target_alias@-gcc@exe_ext@
+/opt/gnatrtems/bin/@Target_alias@-gnatbind
+/opt/gnatrtems/bin/@Target_alias@-gnatbl
+/opt/gnatrtems/bin/@Target_alias@-gnatchop
+/opt/gnatrtems/bin/@Target_alias@-gnatfind
+/opt/gnatrtems/bin/@Target_alias@-gnatkr
+/opt/gnatrtems/bin/@Target_alias@-gnatlink
+/opt/gnatrtems/bin/@Target_alias@-gnatls
+/opt/gnatrtems/bin/@Target_alias@-gnatmake
+/opt/gnatrtems/bin/@Target_alias@-gnatmem
+/opt/gnatrtems/bin/@Target_alias@-gnatprep
+/opt/gnatrtems/bin/@Target_alias@-gnatpsta
+/opt/gnatrtems/bin/@Target_alias@-gnatpsys
+/opt/gnatrtems/bin/@Target_alias@-gnatxref
-%dir /opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
+%dir /opt/gnatrtems/lib/gcc-lib/@Target_alias@/@gcc_version@/include
-/opt/gnatrtems/@target_alias@
+/opt/gnatrtems/@Target_alias@
-%post -n @target_alias@-gnat
+%post -n @Target_alias@-gnat
if test -d $RPM_INSTALL_PREFIX/rtems/info;
then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
@@ -408,7 +408,7 @@ cd ..
done
fi
-%postun -n @target_alias@-gnat
+%postun -n @Target_alias@-gnat
if test -d $RPM_INSTALL_PREFIX/rtems/info;
then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
diff --git a/scripts-ada/mkgdbspec.in b/scripts-ada/mkgdbspec.in
index a89928795d..6603f32742 100644
--- a/scripts-ada/mkgdbspec.in
+++ b/scripts-ada/mkgdbspec.in
@@ -66,7 +66,7 @@ esac
sed -e "s%@Release@%${gdb_rpm_release}%g" \
-e "s%@rpm_build_root@%${rpm_build_root}%g" \
- -e "s%@target_alias@%${target_alias}%g" \
+ -e "s%@Target_alias@%${target_alias}%g" \
-e "s%@gdb_version@%${gdb_version}%g" \
-e "s%@gdb_patch_version@%${gdb_patch_version}%g" \
-e "s%@gnat_version@%${gnat_version}%g" \
diff --git a/scripts-ada/mkgnatnewlibspec.in b/scripts-ada/mkgnatnewlibspec.in
index 1f2ce783bc..99be485bec 100644
--- a/scripts-ada/mkgnatnewlibspec.in
+++ b/scripts-ada/mkgnatnewlibspec.in
@@ -58,7 +58,7 @@ target_alias=$1
specfile=${dst}/${target_alias}-gnat-${gnat_version}-newlib-${newlib_version}.spec
sed -e "s%@Release@%${gnatnewlib_rpm_release}%g" \
- -e "s%@target_alias@%${target_alias}%g" \
+ -e "s%@Target_alias@%${target_alias}%g" \
-e "s%@rpm_build_root@%${rpm_build_root}%g" \
-e "s%@binutils_version@%${binutils_version}%g" \
-e "s%@binutils_patch_version@%${binutils_patch_version}%g" \
@@ -68,6 +68,7 @@ sed -e "s%@Release@%${gnatnewlib_rpm_release}%g" \
-e "s%@gnat_patch_version@%${gnat_patch_version}%g" \
-e "s%@newlib_version@%${newlib_version}%g" \
-e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
+ -e "s%@gnat_newlib_patch_version@%${gnat_newlib_patch_version}%g" \
-e "s%@exe_ext@%${exe_ext}%g" \
< ${specsrc} \
> ${specfile}
diff --git a/scripts-ada/setup b/scripts-ada/setup
index 91d16d0c0c..c91acea9fa 100755
--- a/scripts-ada/setup
+++ b/scripts-ada/setup
@@ -23,25 +23,26 @@ do
echo
echo " GNAT/RTEMS Source packages setup"
echo
- echo "0 binutils version : $binutils_version"
- echo "1 binutils patch version : $binutils_patch_version"
- echo "2 binutils rpm release : $binutils_rpm_release"
- echo "3 gcc version : $gcc_version"
- echo "4 gcc patch version : $gcc_patch_version"
- echo "5 gnat version : $gnat_version"
- echo "6 gnat patch version : $gnat_patch_version"
- echo "7 newlib version : $newlib_version"
- echo "8 newlib patch version : $newlib_patch_version"
- echo "9 gnat/newlib rpm release : $gnatnewlib_rpm_release"
- echo "a gdb version : $gdb_version"
- echo "b gdb patch version : $gdb_patch_version"
- echo "c gdb rpm release : $gdb_rpm_release"
- echo "d rtems version : $rtems_version"
- echo "e rtems rpm release : $rtems_rpm_release"
- echo "f rpm build root : $rpm_build_root"
+ echo "0 binutils version : $binutils_version"
+ echo "1 binutils patch version : $binutils_patch_version"
+ echo "2 binutils rpm release : $binutils_rpm_release"
+ echo "3 gcc version : $gcc_version"
+ echo "4 gcc patch version : $gcc_patch_version"
+ echo "5 gnat version : $gnat_version"
+ echo "6 gnat patch version : $gnat_patch_version"
+ echo "7 newlib version : $newlib_version"
+ echo "8 newlib patch version : $newlib_patch_version"
+ echo "9 gnat newlib patch version : $gnat_newlib_patch_version"
+ echo "a gnat/newlib rpm release : $gnatnewlib_rpm_release"
+ echo "b gdb version : $gdb_version"
+ echo "c gdb patch version : $gdb_patch_version"
+ echo "d gdb rpm release : $gdb_rpm_release"
+ echo "e rtems version : $rtems_version"
+ echo "f rtems rpm release : $rtems_rpm_release"
+ echo "g rpm build root : $rpm_build_root"
echo
- echo -n "[0-9a-f] or any other key to quit >"
+ echo -n "[0-9a-g] or any other key to quit >"
read sel
case $sel in
0) echo -n "BINUTILS source >" ; read binutils_version ;;
@@ -53,13 +54,14 @@ do
6) echo -n "GNAT patch version>" ; read gnat_patch_version ;;
7) echo -n "NEWLIB source >" ; read newlib_version ;;
8) echo -n "NEWLIB patch version>" ; read newlib_patch_version ;;
- 9) echo -n "GNAT/NEWLIB RPM release >" ; read gnatnewlib_rpm_release ;;
- a) echo -n "GDB source >" ; read gdb_version ;;
- b) echo -n "GDB patch version>" ; read gdb_patch_version ;;
- c) echo -n "GDB RPM release >" ; read gdb_rpm_release ;;
- d) echo -n "RTEMS source >" ; read rtems_version ;;
- e) echo -n "RTEMS RPM release >" ; read rtems_rpm_release ;;
- f) echo -n "RPM build root >" ; read rpm_build_root ;;
+ 9) echo -n "GNAT NEWLIB patch version>" ; read gnat_newlib_patch_version ;;
+ a) echo -n "GNAT/NEWLIB RPM release >" ; read gnatnewlib_rpm_release ;;
+ b) echo -n "GDB source >" ; read gdb_version ;;
+ c) echo -n "GDB patch version>" ; read gdb_patch_version ;;
+ d) echo -n "GDB RPM release >" ; read gdb_rpm_release ;;
+ e) echo -n "RTEMS source >" ; read rtems_version ;;
+ f) echo -n "RTEMS RPM release >" ; read rtems_rpm_release ;;
+ g) echo -n "RPM build root >" ; read rpm_build_root ;;
*)
return 0 ;;
esac
@@ -81,6 +83,7 @@ echo "gcc_version=$gcc_version" >> $CFG
echo "gcc_patch_version=$gcc_patch_version" >> $CFG
echo "gnat_version=$gnat_version" >> $CFG
echo "gnat_patch_version=$gnat_patch_version" >> $CFG
+echo "gnat_newlib_patch_version=$gnat_newlib_patch_version" >> $CFG
echo "gnatnewlib_rpm_release=$gnatnewlib_rpm_release" >> $CFG
echo "gdb_version=$gdb_version" >> $CFG
echo "gdb_patch_version=$gdb_patch_version" >> $CFG
diff --git a/scripts-ada/setup.def b/scripts-ada/setup.def
index 153d223b55..54907e41b9 100644
--- a/scripts-ada/setup.def
+++ b/scripts-ada/setup.def
@@ -7,8 +7,9 @@ newlib_patch_version=20010622
gcc_version=2.8.1
gcc_patch_version=20000429
gnat_version=3.13p
+gnat_newlib_patch_version=20010911
gnat_patch_version=20000829
-gnatnewlib_rpm_release=2
+gnatnewlib_rpm_release=3
gdb_version=4.17
gdb_patch_version=20000918
gdb_rpm_release=1