aboutsummaryrefslogtreecommitdiff
path: root/reproduce/src/make
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-04-07 02:22:38 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-04-07 02:22:38 +0100
commit025b96434fe1dd26018dfa898f2e4bdf73401d09 (patch)
tree064a2565bb9abd184103555c28f52f8b05056cdb /reproduce/src/make
parentee548e6fe03994f5560012794fdcb10a9051d568 (diff)
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.
Diffstat (limited to 'reproduce/src/make')
-rw-r--r--reproduce/src/make/dependencies-python.mk15
1 files changed, 9 insertions, 6 deletions
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