diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
| commit | 78737b78ac45d1213395819f3b85b4226088bd1a (patch) | |
| tree | ad87d71fab0d9963bcb944666dc4ac7873569ec0 /reproduce/software/make/python.mk | |
| parent | b0993336112b244ea7e919d96ffdbaf167831b9d (diff) | |
| parent | 743637f54b99310defc2cc5bdbc1bbd8d3e09e0f (diff) | |
Imported some recent/parallel work, conflicts fixed
Especially because of the new convention regarding backslashes, there were
many conflicts that are now fixed. But none were substantial.
Diffstat (limited to 'reproduce/software/make/python.mk')
| -rw-r--r-- | reproduce/software/make/python.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index 4c407f6..1a7be56 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -350,7 +350,9 @@ $(ipydir)/h5py: $(tdir)/h5py-$(h5py-version).tar.gz \ $(ipydir)/pypkgconfig \ $(ipydir)/setuptools \ $(ipydir)/cython \ - $(ibidir)/hdf5 + $(ipydir)/numpy \ + $(ibidir)/hdf5 \ + $(ipydir)/six #$(ipydir)/mpi4py # AFTER its problem is fixed. #export HDF5_MPI=ON; # AFTER its problem is fixed. export HDF5_DIR=$(ildir); \ @@ -496,8 +498,9 @@ $(ipydir)/setuptools_scm: $(tdir)/setuptools_scm-$(setuptools_scm-version).tar.g $(call pybuild, tar xf, $<, setuptools_scm-$(setuptools_scm-version), ,\ Setuptools-scm $(setuptools_scm-version)) -$(ipydir)/sip_tpv: $(tdir)/sip_tpv-$(sip_tpv-version).tar.gz \ - $(ipydir)/mpmath \ +$(ipydir)/sip_tpv: $(tdir)/sip_tpv-$(sip_tpv-version).tar.gz \ + $(ipydir)/astropy \ + $(ipydir)/numpy \ $(ipydir)/sympy $(call pybuild, tar xf, $<, sip_tpv-$(sip_tpv-version), ,) \ && cp $(dtexdir)/sip_tpv.tex $(ictdir)/ \ |