From 025b96434fe1dd26018dfa898f2e4bdf73401d09 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sun, 7 Apr 2019 02:22:38 +0100
Subject: Corrections in configure script and astroquery, astropy rules

The step where we check the possibility of using `sys/cdefs.h' was still
using `$$' for shell variables (in Make), not `$' (for the shell). This was
corrected.

Also, since Astropy needs two citations, the `,' in the citation command
would conflict with Make's parsing. So we just used an `echo' command to
re-write the version info.

In Astroquery, the prerequisite list was just reordered by length to be
more clear to the eye.
---
 configure | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 6059c0e..8a28e4c 100755
--- a/configure
+++ b/configure
@@ -884,33 +884,35 @@ fi
 # explicitly testing a small C program here to see if the host's C compiler
 # won't have any problems in building GCC.
 if [ $host_cc = 0 ]; then
-    tfile=$bdir/gcc-cdefs-test.c;
-    echo "#include <sys/cdefs.h>"     > $$tfile;
-    echo "int main(void){return 0;}" >> $$tfile;
-    if gcc $$tfile -o $bdir/gcc-cdefs-test &> /dev/null; then
-        rm $bdir/gcc-cdefs-test*;
+    tfile=$depdir/gcc-cdefs-test.c;
+    echo "#include <sys/cdefs.h>"     > $tfile;
+    echo "int main(void){return 0;}" >> $tfile;
+    if gcc $tfile -o $depdir/gcc-cdefs-test &> /dev/null; then
+        rm $depdir/gcc-cdefs-test*;
     else
         host_cc=1
     fi;
-    rm $$tfile;
+    rm -f $tfile;
 
     if [ $host_cc = 1 ]; then
         cat <<EOF
 
-!!!!!!!!!!!!!!!!!!!!!!!!
-WARNING: Can't build GCC
-!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!         Warning        !!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 This system's C compiler (called with 'gcc') can't include
-'sys/cdefs.h. Because of this, we can't build our custom GCC. We strongly
-recommend installing the proper package (for your operating system) that
-installs this header file. For example on some Debian-based GNU/Linux
-distros, you need these two packages: 'gcc-multilib' and 'g++-multilib'.
+'sys/cdefs.h. Because of this, this pipeline can't build its custom GCC to
+ensure better reproducibility. We strongly recommend installing the proper
+package (for your operating system) that installs this necessary file. For
+example on some Debian-based GNU/Linux distros, you need these two
+packages: 'gcc-multilib' and 'g++-multilib'.
 
 However, since GCC is pretty low-level, this configuration script will
 continue in 5 seconds and use your system's C compiler (it won't build a
 custom GCC). But please consider installing the necessary package to
 complete your C compiler, then re-run the pipeline.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 EOF
         sleep 5
-- 
cgit v1.2.1