spark2014: sa_messages.ad[sb] added from codepeer

Files needed to build gnatprove are now provided in the gcc tree itself.

https://github.com/AdaCore/spark2014/issues/5

2 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fc4fe405aec..750534a58218 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spark2014-git
 	pkgdesc = formally defined programming language based on ada (gnat fsf)
-	pkgver = 0.3.draft.r17301.g094e550af
-	pkgrel = 5
+	pkgver = 0.3.draft.r17341.g2536e7fb9
+	pkgrel = 1
 	url = https://www.spark-2014.org
 	arch = x86_64
 	license = GPL
@@ -28,14 +28,10 @@ pkgbase = spark2014-git
 	source = git+https://github.com/AdaCore/spark2014
 	source = why3-adacore::git+https://github.com/AdaCore/why3
 	source = git+https://github.com/gcc-mirror/gcc
-	source = https://github.com/AdaCore/spark2014/files/2261639/sa_messages.ads.txt
-	source = https://github.com/AdaCore/spark2014/files/2261640/sa_messages.adb.txt
 	source = makefile-installdir-fixes.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 6f3e5269b3d6e2b6c62d77976994056b7d32668ec2837b91e201405da52546a3
-	sha256sums = 9d4d0d228a025c1d723dbf9f18e2bfd1335f1d35a60360ad67f0cc55e2990a06
 	sha256sums = 2820a309db93782af029ba5b8492379e7aa2c58350629def00f748123866f3dd
 
 pkgname = spark2014-git
diff --git a/PKGBUILD b/PKGBUILD
index 83d77810ca2d..2f88ca910153 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=spark2014-git
-pkgver=0.3.draft.r17301.g094e550af
-pkgrel=5
+pkgver=0.3.draft.r17341.g2536e7fb9
+pkgrel=1
 
 pkgdesc='formally defined programming language based on ada (gnat fsf)'
 url='https://www.spark-2014.org'
@@ -20,18 +20,17 @@ optdepends=('alt-ergo: alternative prover'
 provides=('spark2014')
 conflicts=('spark2014' 'why3')
 
+# I could potentially use github's svn support to checkout only the gcc/ada
+# directory instead of cloning the entire gcc tree.  The downside to this is
+# that github will take awhile to generate the checkout.
+# svn+https://github.com/gcc-mirror/gcc/trunk/gcc/ada
 source=('git+https://github.com/AdaCore/spark2014'
         'why3-adacore::git+https://github.com/AdaCore/why3'
         'git+https://github.com/gcc-mirror/gcc'
-        'https://github.com/AdaCore/spark2014/files/2261639/sa_messages.ads.txt'
-        'https://github.com/AdaCore/spark2014/files/2261640/sa_messages.adb.txt'
         'makefile-installdir-fixes.diff')
 
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            '6f3e5269b3d6e2b6c62d77976994056b7d32668ec2837b91e201405da52546a3'
-            '9d4d0d228a025c1d723dbf9f18e2bfd1335f1d35a60360ad67f0cc55e2990a06'
+
+sha256sums=('SKIP' 'SKIP' 'SKIP'
             '2820a309db93782af029ba5b8492379e7aa2c58350629def00f748123866f3dd')
 
 prepare() {
@@ -42,10 +41,6 @@ prepare() {
 
     ln -sf "$srcdir"/gcc/gcc/ada gnat2why/gnat_src
 
-    # https://github.com/AdaCore/spark2014/issues/5#issuecomment-410622564
-    ln -sf "$srcdir"/sa_messages.ads.txt gnat2why/gnat_src/sa_messages.ads
-    ln -sf "$srcdir"/sa_messages.adb.txt gnat2why/gnat_src/sa_messages.adb
-
     # Use install instead of mv to install the various targets while also
     # houring the INSTALLDIR convention used within this Makefile.
     patch -Np1 -i "$srcdir"/makefile-installdir-fixes.diff
@@ -84,13 +79,13 @@ package() {
     install -Dm0755 install/bin/spark_memcached_wrapper "$pkgdir"/usr/bin/spark_memcached_wrapper
     install -Dm0755 install/bin/spark_report "$pkgdir"/usr/bin/spark_report
 
-    # For some reason the spark install why3 drivers and the other bits
-    # gnatprove needs to function.
+    # For some reason the spark install doesn't include the why3 drivers and
+    # the other bits which gnatprove needs to function.
     cp -a --no-preserve=ownership install/share/why3 "$pkgdir"/usr/share
 
     # Needed?
     # install -Dm0755 install/bin/why3cpulimit "$pkgdir"/usr/lib/spark/bin/why3cpulimit
-    # rm -f -- "$pkgdir"/usr/bin/target.atp
+    rm -f -- "$pkgdir"/usr/bin/target.atp
 
     install -Dm0644 docs/lrm/_build/man/spark2014refman.1 "$pkgdir"/usr/share/man/man7/spark2014_reference.7
     install -Dm0644 docs/ug/_build/man/spark2014usersguide.1 "$pkgdir"/usr/share/man/man7/spark2014_userguide.7