diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-01-24 10:39:05 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-01-24 10:39:05 +0000 |
| commit | 90fc8ad3c38bbf87ca4514db456c34c2196cfce9 (patch) | |
| tree | 733f901b28c61a9f88f7564a5ac57f21b2c066a4 | |
| parent | 0f97f15a8d183c6b14894f47c40968e92104181d (diff) | |
Updated fork of metastore allows building on macOS
I recently found another fork of metastore that allows its build on macOS
systems (https://github.com/mpctx/metastore). So I forked it into my own
fork with several other corrections (mostly cosmetic!), so it is now much
better suited for this pipeline.
Raul Infante-Sainz has already tested the building of metastore on his
macOS. In a previous test, we also noticed that libbsd should not be built
on Mac systems, so it is now a conditional prerequisite to metastore.
| -rw-r--r-- | .file-metadata | bin | 3774 -> 3714 bytes | |||
| -rw-r--r-- | reproduce/config/pipeline/dependency-versions.mk | 2 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 22 |
3 files changed, 20 insertions, 4 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex 04c25e5..392f66d 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index e6cfcee..3e588f1 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -22,7 +22,7 @@ libtool-version = 2.4.6 libbsd-version = 0.9.1 lzip-version = 1.20 make-version = 4.2.90 -metastore-version = 1.1.2-21-dbc7b9b +metastore-version = 1.1.2-23-fa9170b mpfr-version = 4.0.1 mpc-version = 1.1.0 ncurses-version = 6.1 diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 1cc2b00..4610226 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -354,10 +354,26 @@ $(ibdir)/git: $(tdir)/git-$(git-version).tar.xz \ --without-tcltk --with-shell=$(ibdir)/bash, \ V=1) -# Metastore is used to keep file modification dates (and generally many -# meta-data) within the Git history. +# Metastore is used (through a Git hook) to restore the source modification +# dates of files after a Git checkout. Another Git hook saves all file +# metadata just before a commit (to allow restoration after a +# checkout). Since this pipeline is managed in Makefiles, file modification +# dates are critical to not having to redo the whole analysis after +# checking out between branches. +# +# Note that we aren't using the standard version of Metastore, but a fork +# of it that is maintained in this repository: +# https://gitlab.com/makhlaghi/metastore-fork +# +# Libbsd is not necessary on macOS systems, because macOS is already a +# BSD-based distribution. But on GNU/Linux systems, it is necessary. +ifeq ($(on_mac_os),yes) +needlibbsd = +else +needlibbsd = $(ilidir)/libbsd +endif $(ibdir)/metastore: $(tdir)/metastore-$(metastore-version).tar.gz \ - $(ilidir)/libbsd \ + $(needlibbsd) \ $(ibdir)/git # The build command below will change the current directory of this |