Revert "ada: merged into a single spell, this one is a meta spell for transition"

Forgot HISTORY entries

This reverts commit 54112ba7c805b483600eb45feee3586dd761de16.

6 files changed, 131 insertions, 8 deletions

diff --git a/gnu/ada/BUILD b/gnu/ada/BUILD
index 27ba77ddaf..f632968314 100755
--- a/gnu/ada/BUILD
+++ b/gnu/ada/BUILD
@@ -1 +1,44 @@
-true
+# 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  &&
+
+# setup bootstrap ada compiler
+ADA_PATH=${SOURCE3/.tar.bz2/}                   &&
+PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH  &&
+
+if [[ $CROSS_INSTALL == on ]]; then
+  OPTS="--host=$HOST $OPTS"
+else
+  OPTS="--build=$HOST $OPTS"
+fi  &&
+
+export          CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"                      &&
+export INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/include"  &&
+export     LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/"         &&
+export     LDFLAGS="-L${LIB_DIR}"
+
+export    LIBRARY_PATH="$LIB_DIR"                             &&
+export LD_LIBRARY_PATH="$LIB_DIR"                             &&
+export   COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin"  &&
+
+export ADA_OBJECTS_PATH="$LIB_DIR/adalib"      &&
+export ADA_INCLUDE_PATH="$LIB_DIR/adainclude"  &&
+
+cd $SOURCE_DIRECTORY.bld                                   &&
+$SOURCE_DIRECTORY/configure                                \
+             --prefix=${INSTALL_ROOT}/usr                  \
+             --infodir=${INSTALL_ROOT}/usr/share/info      \
+             --mandir=${INSTALL_ROOT}/usr/share/man        \
+             --enable-threads=posix                        \
+             --with-system-zlib                            \
+             --program-prefix=gnat                         \
+             --enable-libada                               \
+             --enable-languages="c,ada"                    \
+             $GCC_MULTILIB                                 \
+             $OPTS                                         &&
+
+make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"  \
+     bootstrap
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index 4251501913..a1d2c84bff 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -1 +1,9 @@
-depends -sub ADA gcc
+. $GRIMOIRE/libcompat  &&
+depends  gcc  &&
+if  [[  $VERSION != $(installed_version gcc) ]]; then
+  force_depends  gcc
+fi &&
+
+depends  gmp             &&
+depends  mpfr            &&
+depends  smgl-archspecs
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index 0d626a1da0..b9359611d0 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,12 +1,41 @@
            SPELL=ada
          VERSION=4.3.3
+          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
+         SOURCE2=gcc-$SPELL-$VERSION.tar.gz
+     SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
+  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
+  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
+if    [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
+then
+         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
+elif  [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+         SOURCE3=gnat-4.3.0-x86_64-pc-linux-gnu.tar.bz2
+else
+         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
+fi
+  SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
+     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:VERIFIED_UPSTREAM_KEY"
+         SOURCE4=$SOURCE3.sig
+  SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
+  SOURCE4_IGNORE=signature
+#upstream signatures
+         SOURCE5=$SOURCE.sig
+  SOURCE5_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE5_IGNORE=signature
+         SOURCE6=$SOURCE2.sig
+  SOURCE6_URL[0]=${SOURCE2_URL[0]}.sig
+  SOURCE6_IGNORE=signature
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
-         ENTERED=20040704
+         ENTERED=20050213
             DOCS="$DOCS INSTALL"
         KEYWORDS="compiler"
-           SHORT="the GNU ada compiler"
+           SHORT="the GNU Ada Translator"
 cat << EOF
-The GNU ada compiler and runtime library.
+The GNU Ada Translator and Ada95 runtime library.
 EOF
-
diff --git a/gnu/ada/FINAL b/gnu/ada/FINAL
new file mode 100755
index 0000000000..907a1a0f9f
--- /dev/null
+++ b/gnu/ada/FINAL
@@ -0,0 +1 @@
+rm_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/ada/INSTALL b/gnu/ada/INSTALL
index 27ba77ddaf..32b9891fa7 100755
--- a/gnu/ada/INSTALL
+++ b/gnu/ada/INSTALL
@@ -1 +1,7 @@
-true
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd  $SOURCE_DIRECTORY.bld  &&
+
+make -C gcc install lang.install-common lang.install-man  &&
+install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/
diff --git a/gnu/ada/PRE_BUILD b/gnu/ada/PRE_BUILD
index 27ba77ddaf..55467be3ab 100755
--- a/gnu/ada/PRE_BUILD
+++ b/gnu/ada/PRE_BUILD
@@ -1 +1,37 @@
-true
+if [ "$(installed_version gcc)" != "$VERSION" ]; then
+  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version gcc), not $VERSION!"
+  message "Update gcc first.${DEFAULT_COLOR}"
+  return 1;
+fi
+
+default_pre_build                     &&
+cd $BUILD_DIRECTORY                   &&
+unpack_file 2                         &&
+cd $SOURCE_DIRECTORY                  &&
+mkdir ${SOURCE3/.tar.bz2/}            &&
+cd  ${SOURCE3/.tar.bz2/}              &&
+unpack_file 3                         &&
+mk_source_dir  $SOURCE_DIRECTORY.bld  &&
+
+#
+# This section is used to build a gnat bootstrap cache
+#
+touch  $SOURCE_DIRECTORY/gcc/cstamp-h.in       &&
+touch  $SOURCE_DIRECTORY/gcc/ada/[es]info.h    &&
+touch  $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs]  &&
+
+#
+# Set the compiler name to gnatgcc
+#
+for file in `find $SOURCE_DIRECTORY/gcc/ada/ -name '*.ad[sb]'`
+do
+  sedit "s:\"gcc\":\"gnatgcc\":g" $file
+done  &&
+
+sedit 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):'    \
+       $SOURCE_DIRECTORY/gcc/ada/makegpr.adb      &&
+sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
+       $SOURCE_DIRECTORY/gcc/ada/osint.ads
+#
+# End Ada bootstrap cache code
+#