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.
---
 .file-metadata                            | Bin 4250 -> 4690 bytes
 configure                                 |  28 +++++++++++++++-------------
 reproduce/src/make/dependencies-python.mk |  15 +++++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.file-metadata b/.file-metadata
index e152551..8762380 100644
Binary files a/.file-metadata and b/.file-metadata differ
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
diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk
index 3a77fa9..5b12757 100644
--- a/reproduce/src/make/dependencies-python.mk
+++ b/reproduce/src/make/dependencies-python.mk
@@ -257,7 +257,7 @@ $(ibidir)/python3: $(tdir)/python-$(python-version).tar.gz \
 pybuild = cd $(ddir); rm -rf $(3);                                \
 	 if ! $(1) $(2); then echo; echo "Tar error"; exit 1; fi; \
 	 cd $(3);                                                 \
-	 if [ "x$(4)" != x ]; then                                \
+	 if [ "x$(strip $(4))" != x ]; then                       \
 	   sed -e 's|@LIBDIR[@]|'"$(ildir)"'|'                    \
 	       -e 's|@INCDIR[@]|'"$(idir)/include"'|'             \
 	       $(4) > site.cfg;                                   \
@@ -282,12 +282,12 @@ $(ipydir)/asn1crypto: $(tdir)/asn1crypto-$(asn1crypto-version).tar.gz \
 	                Asn1crypto $(asn1crypto-version))
 
 $(ipydir)/astroquery: $(tdir)/astroquery-$(astroquery-version).tar.gz  \
-                      $(ipydir)/astropy                                \
                       $(ipydir)/beautifulsoup4                         \
                       $(ipydir)/html5lib                               \
+                      $(ipydir)/requests                               \
+                      $(ipydir)/astropy                                \
                       $(ipydir)/keyring                                \
-                      $(ipydir)/numpy                                  \
-                      $(ipydir)/requests
+                      $(ipydir)/numpy
 	$(call pybuild, tar xf, $<, astroquery-$(astroquery-version), ,\
 	                Astroquery $(astroquery-version))
 
@@ -295,8 +295,11 @@ $(ipydir)/astropy: $(tdir)/astropy-$(astropy-version).tar.gz \
                    $(ipydir)/h5py                            \
                    $(ipydir)/numpy                           \
                    $(ipydir)/scipy
-	$(call pybuild, tar xf, $<, astropy-$(astropy-version), ,\
-	                "Astropy $(astropy-version) \citep{astropy2013,astropy2018}")
+        # Since we have two citations in Astropy (with the `,' character
+        # which can be confused in Make), its easier to just re-write the
+        # full version after the build.
+	$(call pybuild, tar xf, $<, astropy-$(astropy-version)) \
+	&& echo "Astropy $(astropy-version) \citep{astropy2013,astropy2018}" > $@
 
 $(ipydir)/beautifulsoup4: $(tdir)/beautifulsoup4-$(beautifulsoup4-version).tar.gz \
                           $(ipydir)/soupsieve
-- 
cgit v1.2.1