diff options
| -rw-r--r-- | .file-metadata | bin | 4007 -> 4420009 bytes | |||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | reproduce/config/pipeline/dependency-versions.mk | 1 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 9 |
4 files changed, 11 insertions, 2 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex ebc3dfe..2fcf734 100644 --- a/.file-metadata +++ b/.file-metadata @@ -11,6 +11,7 @@ mmap_* *.auxlock .tex +build .local Makefile tex/tikz @@ -24,4 +25,4 @@ gnuastro-local.conf reproduce/config/pipeline/LOCAL.mk reproduce/BDIR/ -reproduce/SURVEY/
\ No newline at end of file +reproduce/SURVEY/ diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 41a4cf9..46dfabd 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -29,6 +29,7 @@ ncurses-version = 6.1 openssl-version = 1.1.1a patchelf-version = 0.9 pkgconfig-version = 0.29.2 +python-version = 3.6.8 readline-version = 8.0 sed-version = 4.7 tar-version = 1.31 diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 80a787e..101002c 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -43,7 +43,7 @@ ildir = $(BDIR)/dependencies/installed/lib ilidir = $(BDIR)/dependencies/installed/lib/built # Define the top-level programs to build (installed in `.local/bin'). -top-level-programs = astnoisechisel metastore flock zip unzip +top-level-programs = astnoisechisel metastore flock python3 unzip zip all: $(ddir)/texlive-versions.tex \ $(foreach p, $(top-level-programs), $(ibdir)/$(p)) @@ -101,6 +101,7 @@ tarballs = $(foreach t, cfitsio-$(cfitsio-version).tar.gz \ libtool-$(libtool-version).tar.xz \ libgit2-$(libgit2-version).tar.gz \ metastore-$(metastore-version).tar.gz \ + python-$(python-version).tar.gz \ unzip-$(unzip-version).tar.gz \ tiff-$(libtiff-version).tar.gz \ zip-$(zip-version).tar.gz \ @@ -141,6 +142,9 @@ $(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 = python ]; then + mergenames=0 + w=https://www.python.org/ftp/python/$(python-version)/Python-$(python-version).tgz elif [ $$n = tiff ]; then w=https://download.osgeo.org/libtiff elif [ $$n = unzip ]; then w=ftp://ftp.info-zip.org/pub/infozip/src mergenames=0; v=$$(echo $(unzip-version) | sed -e's/\.//') @@ -446,6 +450,9 @@ endif $$staticopts, -j$(numthreads), \ make check -j$(numthreads)) +$(ibdir)/python3: $(tdir)/python-$(python-version).tar.gz + $(call gbuild, $<, python-$(python-version)) + $(ibdir)/unzip: $(tdir)/unzip-$(unzip-version).tar.gz v=$$(echo $(unzip-version) | sed -e's/\.//') $(call gbuild, $<, unzip$$v, static,, \ |