diff options
| -rw-r--r-- | .file-metadata | bin | 4420009 -> 5003262 bytes | |||
| -rw-r--r-- | reproduce/config/pipeline/dependency-versions.mk | 1 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 23 |
3 files changed, 21 insertions, 3 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex 2fcf734..5df4e17 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 46dfabd..0bea16a 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -26,6 +26,7 @@ metastore-version = 1.1.2-23-fa9170b mpfr-version = 4.0.1 mpc-version = 1.1.0 ncurses-version = 6.1 +numpy-version = 1.16.1 openssl-version = 1.1.1a patchelf-version = 0.9 pkgconfig-version = 0.29.2 diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 101002c..52b65f4 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -41,10 +41,13 @@ idir = $(BDIR)/dependencies/installed ibdir = $(BDIR)/dependencies/installed/bin ildir = $(BDIR)/dependencies/installed/lib ilidir = $(BDIR)/dependencies/installed/lib/built +pydir = $(BDIR)/dependencies/installed/lib/python # Define the top-level programs to build (installed in `.local/bin'). -top-level-programs = astnoisechisel metastore flock python3 unzip zip -all: $(ddir)/texlive-versions.tex \ +top-level-python = numpy +top-level-programs = astnoisechisel metastore flock zip +all: $(ddir)/texlive-versions.tex \ + $(foreach p, $(top-level-python), $(pydir)/$(p)) \ $(foreach p, $(top-level-programs), $(ibdir)/$(p)) # Other basic environment settings: We are only including the host @@ -101,6 +104,7 @@ tarballs = $(foreach t, cfitsio-$(cfitsio-version).tar.gz \ libtool-$(libtool-version).tar.xz \ libgit2-$(libgit2-version).tar.gz \ metastore-$(metastore-version).tar.gz \ + numpy-$(numpy-version).zip \ python-$(python-version).tar.gz \ unzip-$(unzip-version).tar.gz \ tiff-$(libtiff-version).tar.gz \ @@ -142,6 +146,7 @@ $(tarballs): $(tdir)/%: mergenames=0 w=https://github.com/libgit2/libgit2/archive/v$(libgit2-version).tar.gz elif [ $$n = metastore ]; then w=http://akhlaghi.org/src + elif [ $$n = numpy ]; then w=https://fossies.org/linux/misc elif [ $$n = python ]; then mergenames=0 w=https://www.python.org/ftp/python/$(python-version)/Python-$(python-version).tgz @@ -451,7 +456,10 @@ endif make check -j$(numthreads)) $(ibdir)/python3: $(tdir)/python-$(python-version).tar.gz - $(call gbuild, $<, python-$(python-version)) + $(call gbuild, $<, python-$(python-version)) \ + && v=$$(echo $(python-version) | awk 'BEGIN{FS="."} \ + {printf "%d.%d\n", $$1, $$2}') \ + && ln -s $(ildir)/python$$v $(ildir)/python $(ibdir)/unzip: $(tdir)/unzip-$(unzip-version).tar.gz v=$$(echo $(unzip-version) | sed -e's/\.//') @@ -473,6 +481,15 @@ $(ibdir)/zip: $(tdir)/zip-$(zip-version).tar.gz +# Python packages +# --------------- +$(pydir)/numpy: $(tdir)/numpy-$(numpy-version).zip \ + $(ibdir)/python3 \ + $(ibdir)/unzip + pip3 install $< --verbose + + + # Since we want to avoid complicating the PATH, we are putting a symbolic # link of all the TeX Live executables in $(ibdir). But symbolic links are # hard to track for Make (as a target). Also, TeX in general is optional |