sync gnu/ada from test

7 files changed, 66 insertions, 41 deletions

diff --git a/gnu/ada/BUILD b/gnu/ada/BUILD
index d69d41af23..9a423da51c 100755
--- a/gnu/ada/BUILD
+++ b/gnu/ada/BUILD
@@ -1,14 +1,19 @@
-source $DEPENDS_CONFIG/gcc.p  &&
+# take multilib option from GCC
+# ignore return value as it is only available on x86_64
+persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
+# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
+persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
+persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
+
 local OLD_CFLAGS="$CFLAGS"  &&
-if [[ $SOURCE3 ]]; then
-  # setup bootstrap ada compiler
-  cd $SOURCE_DIRECTORY/gnat-3.15p-i686-pc-linux-gnu-bin  &&
-  mkdir -p  $SOURCE_DIRECTORY/gnat-bin                   &&
-  make  ins-all  prefix=$SOURCE_DIRECTORY/gnat-bin       &&
-  PATH=$SOURCE_DIRECTORY/gnat-bin/bin:$PATH              &&
-  CFLAGS=""
-fi  &&
-cd $SOURCE_DIRECTORY.bld                                  &&
+# setup bootstrap ada compiler
+cd $SOURCE_DIRECTORY/gnat-3.15p-i686-pc-linux-gnu-bin  &&
+mkdir -p  $SOURCE_DIRECTORY/gnat-bin                   &&
+make  ins-all  prefix=$SOURCE_DIRECTORY/gnat-bin       &&
+PATH=$SOURCE_DIRECTORY/gnat-bin/bin:$PATH              &&
+CFLAGS=""                                              &&
+
+cd $SOURCE_DIRECTORY.bld                                   &&
 $SOURCE_DIRECTORY/configure                                \
              --host=$HOST                                  \
              --prefix=${INSTALL_ROOT}/usr                  \
@@ -17,15 +22,10 @@ $SOURCE_DIRECTORY/configure                                \
              --enable-threads=posix                        \
              --with-system-zlib                            \
              --enable-languages=ada                        \
+             $GCC_MULTILIB                                 \
              $OPTS                                         &&
 
-if [[ $SOURCE3 ]]; then
-  CFLAGS="$OLD_CFLAGS"  &&
-  # bootstrapping with gnat-bin needs different CFLAGS for the stage1 compile
-  make CFLAGS="" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-       profiledbootstrap
-else
-  make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-       profiledbootstrap
-fi  &&
-make -C gcc gnatlib gnattools
+CFLAGS="$OLD_CFLAGS"  &&
+# bootstrapping with gnat-bin needs different CFLAGS for the stage1 compile
+make CFLAGS="" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+     profiledbootstrap
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index 826e93ed42..6aa97c6122 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -1 +1,5 @@
-depends  gcc
+. $GRIMOIRE/libcompat  &&
+depends  gcc  &&
+if  [[  $VERSION != $(installed_version gcc) ]]; then
+  force_depends  gcc
+fi
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index 3e7fcbd4e5..b966c7d949 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,19 +1,17 @@
            SPELL=ada
-         VERSION=3.4.5
+         VERSION=4.0.3
+     SOURCE_HASH=sha512:c15cb60d4881dde30425c4ce682bc7d9b9363c177e5ca7d2e05dc83181a29c805199ead946eef451fec17a834a5114bff63ea062c4b6de12243c86b2f7389c23
+    SOURCE2_HASH=sha512:0ce3d07b7baeda018d3268e2bd75f14d2b532095e2c08615f32070e0196dc5e4a71c0fbb075df0ae77255e95b9668fde270b0cdcdd76d3df278e7366d5868a7e 
+    SOURCE3_HASH=sha512:b68d0b4a53235565bc8b1d6e05eb96ad4913733252129c7328367fc0eec4bdc65dfedbf2482015f5b84ae8532a2d52b2c4048f75d23b922dd77a4ffe243a9c12
           SOURCE=gcc-core-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
    SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
    SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-     SOURCE_HASH=sha512:997289b39e5605bac84c2a5d80a4e5dc2d24d4f1c742b494e4fbee4d0f16f64ae9ce860ccdc99c9764a29ec92ad066fd4faf5789fc5d7f49173eace263fe5c01 
          SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
   SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
   SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-    SOURCE2_HASH=sha512:b52050587e8827e2d6407b82ee39bfbf70902264180bc183a365fba4039afa4928d78872d08ff2276c19fa22b67b87d628b4bb5c91f9f718a14d1fcf3676c6cc 
-if [ ! -x /usr/bin/gnatmake ]; then
          SOURCE3=gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz
-  SOURCE3_URL[0]=$SOURCEFORGE_URL/gnuada/$SOURCE3
-    SOURCE3_HASH=sha512:b68d0b4a53235565bc8b1d6e05eb96ad4913733252129c7328367fc0eec4bdc65dfedbf2482015f5b84ae8532a2d52b2c4048f75d23b922dd77a4ffe243a9c12
-fi
+  SOURCE3_URL[0]=http://libre.act-europe.fr/GNAT/3.15p/$SOURCE3
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20050213
@@ -23,3 +21,4 @@ fi
 cat << EOF
 The GNU Ada Translator and Ada95 runtime library.
 EOF
+
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index 19cf543df1..40467448f3 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,17 +1,39 @@
-2006-01-23 George Sherwood <george@beernabeer.com>
-	* DETAILS: Updated to 3.4.5. Fixed SOURCE3 SOURCE_URL
-	* PRE_BUILD: Updated for unpack_file
+2006-03-10 David Brown <dmlb2000@gmail.com>
+	* DETAILS: updated to 4.0.3
 
-2005-11-23 Arwed v. Merkatz <v.merkatz@gmx.net>
-	* BUILD: source gcc configuration so GCC_MULTILIB is set correctly,
-	  see bug #10119
+2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: use force_depends gcc if version doesn't match so it gets
+	  recompiled
 
-2005-06-03 David Brown <dmlb2000@excite.com>
-	* DETAILS: updated 3.4.4
+2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* BUILD: persistent_read the CFLAGS and LDFLAGS of gcc and use them,
+	  fixes bug #10087, persistent_read GCC_MULTILIB instead of sourcing
+	  gcc.p
+	* POST_RESURRECT: setup specs file after resurrection (bug #8726)
+
+2005-10-02 Sergey Lipnevich <sergey@sourcemage.org>
+	* DETAILS: upgrade to 4.0.2;
+	* PRE_BUILD: use unpack_file API.
+
+2005-07-09 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DETAILS: updated to 4.0.1
 
 2005-05-18 Arwed v. Merkatz <v.merkatz@gmx.net>
 	* PRE_BUILD: return 1 if the current gcc isn't the same version
 
+2005-04-23 Sergey Lipnevich <sergey@sourcemage.org>
+	* BUILD: use gcc's configuration for multilib option.
+
+2005-04-22 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* BUILD: removed the make gnatlib gnattools as those are built
+	  automatically now
+
+2005-04-21 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DETAILS: updated to 4.0.0
+	* DETAILS, BUILD, PRE_BUILD: unconditionally use the binary gnat to
+	  bootstrap, otherwise fails after gcc was updated
+	* specs_ada: updated
+
 2005-02-13 Arwed v. Merkatz <v.merkatz@gmx.net>
 	* BUILD, DETAILS, FINAL, HISTORY, INSTALL, POST_REMOVE, PRE_BUILD,
 	  PROVIDES, SOLO, specs_ada:
diff --git a/gnu/ada/POST_RESURRECT b/gnu/ada/POST_RESURRECT
new file mode 100755
index 0000000000..b6c486727f
--- /dev/null
+++ b/gnu/ada/POST_RESURRECT
@@ -0,0 +1,2 @@
+local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
+cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/ada/PRE_BUILD b/gnu/ada/PRE_BUILD
index 540f4bf29e..db044fd835 100755
--- a/gnu/ada/PRE_BUILD
+++ b/gnu/ada/PRE_BUILD
@@ -6,8 +6,6 @@ fi
 default_pre_build                &&
 cd $BUILD_DIRECTORY              &&
 unpack_file 2                    &&
-if [[ $SOURCE3 ]]; then
-  cd $SOURCE_DIRECTORY             &&
-  unpack_file 3
-fi  &&
+cd $SOURCE_DIRECTORY             &&
+unpack_file 3                    &&
 mk_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/ada/specs_ada b/gnu/ada/specs_ada
index f048c32e73..a0d4c66703 100644
--- a/gnu/ada/specs_ada
+++ b/gnu/ada/specs_ada
@@ -1,5 +1,5 @@
 @ada:
-%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %{!gnatc*:%{!gnatz*:%{!gnats*:%{!S:%{!c: %eone of -c, -S, -gnatc, -gnatz, or -gnats is required for Ada}}}}} gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %1 %{!Q:-quiet} %{nostdinc*} %{nostdlib*} -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}} %{g*} %{O*} %{W*} %{w} %{p} %{pg:-p} %{m*} %{a} %{f*} %{d*} %{!S:%{o*:%w%*-gnatO}} %i %{S:%W{o*}%{!o*:-o %b.s}} %{!gnatc*:%{!gnatz*:%{!gnats*:%(invoke_as)}}}
+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %{!S:%{!c:%e-c or -S required for Ada}} gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %{!Q:-quiet} %{nostdinc*} %{nostdlib*} -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}} %{O*} %{W*} %{w} %{p} %{pg:-p} %{a} %{f*} %{d*} %{g*&m*} %1 %{!S:%{o*:%w%*-gnatO}} %i %{S:%W{o*}%{!o*:-o %b.s}} %{gnatc*|gnats*: -o %j} %{-param*} %{!gnatc*:%{!gnats*:%(invoke_as)}}
 
 .ads:
 @ada