diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 04:02:28 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 04:02:28 +0100 |
| commit | 9ed594ec27405e38548d6efd6fe28a4dabf0fb41 (patch) | |
| tree | c1fdf80bd1b65056d5216b9cdda2e3fccc958c1a /reproduce/software/make/python.mk | |
| parent | f4d998a36d6777164147b848b0ac4747c38067cf (diff) | |
| parent | 8eb0892e179b4970a9835d29b5f57dd912ca4464 (diff) | |
Imported recent work in Maneage, minor conflicts fixed
A few minor conflicts came up that were easily fixed.
Diffstat (limited to 'reproduce/software/make/python.mk')
| -rw-r--r-- | reproduce/software/make/python.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index a1d198d..1ef1bf2 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -393,7 +393,7 @@ $(ipydir)/astropy: $(ipydir)/h5py \ # Currently, when the Expat library is already built in a project # (for example as a dependency of another program), Astropy's # internal building of Expat will conflict with the project's. So - # we have added Expat as a dependency of astropy (so it is always + # we have added Expat as a dependency of Astropy (so it is always # built before it, and we tell Astropy to use the project's # libexpat. pyhook_before () { @@ -599,7 +599,8 @@ $(ipydir)/numpy: $(ibidir)/unzip \ else \ export LDFLAGS="$(LDFLAGS) -shared"; \ fi; \ - conf="$$(pwd)/reproduce/software/config/installation/numpy-scipy.cfg"; \ + export CFLAGS="--std=c99 $$CFLAGS"; \ + conf="$$(pwd)/reproduce/software/config/numpy-scipy.cfg"; \ $(call pybuild, unzip, numpy-$(numpy-version),$$conf, \ Numpy $(numpy-version)) \ && cp $(dtexdir)/numpy.tex $(ictdir)/ \ @@ -678,7 +679,7 @@ $(ipydir)/scipy: $(ipydir)/numpy \ else \ export LDFLAGS="$(LDFLAGS) -shared"; \ fi; \ - conf="$$(pwd)/reproduce/software/config/installation/numpy-scipy.cfg"; \ + conf="$$(pwd)/reproduce/software/config/numpy-scipy.cfg"; \ $(call pybuild, tar xf, scipy-$(scipy-version),$$conf) \ && cp $(dtexdir)/scipy.tex $(ictdir)/ \ && echo "Scipy $(scipy-version) \citep{scipy2007,scipy2011}" > $@ |