From 1c38c9adf8daa7600630619840de55385c124f83 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 18 Oct 2000 16:44:00 +0000 Subject: 2000-10-18 Joel Sherrill * setup.def, gdb/gdb.spec.in,gnatnewlib/gnatnewlib.spec.in: Updated to reflect gnat 3.13p successfully building. --- scripts-ada/ChangeLog | 5 +++++ scripts-ada/gdb/gdb.spec.in | 3 ++- scripts-ada/gnatnewlib/gnatnewlib.spec.in | 11 ++++++++++- scripts-ada/setup.def | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) (limited to 'scripts-ada') diff --git a/scripts-ada/ChangeLog b/scripts-ada/ChangeLog index b92fdf7568..e7115e667b 100644 --- a/scripts-ada/ChangeLog +++ b/scripts-ada/ChangeLog @@ -1,3 +1,8 @@ +2000-10-18 Joel Sherrill + + * setup.def, gdb/gdb.spec.in,gnatnewlib/gnatnewlib.spec.in: + Updated to reflect gnat 3.13p successfully building. + 2000-08-30 Joel Sherrill * setup.def: Updated to gnat-3.13p and adjusted all versions diff --git a/scripts-ada/gdb/gdb.spec.in b/scripts-ada/gdb/gdb.spec.in index 34b3981374..6ec5f33dd4 100644 --- a/scripts-ada/gdb/gdb.spec.in +++ b/scripts-ada/gdb/gdb.spec.in @@ -19,7 +19,7 @@ Provides: rtems-base-gnat-gdb @target_alias@-gnat-gdb Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com -Version: @gdb_version@ +Version: gnat@gnat_version@ 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 @@ -38,6 +38,7 @@ Buildroot: /tmp # Or you can try the ftp options of rpm :-) # NoSource: 0 +NoSource: 1 %description RTEMS is an open source operating system for embedded systems. diff --git a/scripts-ada/gnatnewlib/gnatnewlib.spec.in b/scripts-ada/gnatnewlib/gnatnewlib.spec.in index a33801180c..51c8f9790f 100644 --- a/scripts-ada/gnatnewlib/gnatnewlib.spec.in +++ b/scripts-ada/gnatnewlib/gnatnewlib.spec.in @@ -30,6 +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 # Buildroot: /tmp @@ -119,10 +120,15 @@ This is gnat, gcc, and newlib C Library for @target_alias@. %setup -c -n @target_alias@-gnat-newlib -a 0 -a 1 -a 2 -a 3 %patch0 -p0 -%patch1 -p0 %patch2 -p0 %patch3 -p0 +# this patch needs to be applied with a -p1 +cd newlib-@newlib_version@ +%patch1 -p1 +%patch4 -p1 +cd .. + # this 281 needs to be a variable. :( cd gcc-@gcc_version@ patch -p0 <../gnat-@gnat_version@-src/src/gcc-281.dif @@ -242,6 +248,9 @@ This is gnat, gcc, and newlib C Library for @target_alias@. CC=gcc CFLAGS="-O2 -g -gnata -gnatp" LANGUAGES="c ada" install # GNAT has to be mostly installed to even build itself +# hack to get rid of symlinks to dynamic libraries that don't exist + find $RPM_BUILD_ROOT/opt/gnatrtems -name "*.so" | xargs -e rm -f + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install-info # cd go back to build/ diff --git a/scripts-ada/setup.def b/scripts-ada/setup.def index 075ef3ba61..d1c2cf7b72 100644 --- a/scripts-ada/setup.def +++ b/scripts-ada/setup.def @@ -3,15 +3,15 @@ binutils_version=2.9.1 binutils_patch_version=20000429 binutils_rpm_release=3 newlib_version=1.8.2 -newlib_patch_version=20000828 +newlib_patch_version=20000907 gcc_version=2.8.1 gcc_patch_version=20000429 gnat_version=3.13p gnat_patch_version=20000829 gnatnewlib_rpm_release=1 gdb_version=4.17 -gdb_patch_version=20000429 -gdb_rpm_release=3 +gdb_patch_version=20000918 +gdb_rpm_release=1 rtems_version=NA rtems_rpm_release=1 rpm_build_root=/tmp -- cgit v1.2.3