diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2022-05-10 01:46:37 +0200 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2022-05-10 01:46:37 +0200 |
| commit | 4f376e9f27209fb5a69addcc56a37abe8fb8ef01 (patch) | |
| tree | cf1a9e7a70d4d0c2bfede0ac02e27533e82855cc /reproduce/software/config | |
| parent | f51b5e2e500dd6450a5a3425e85df78245fc5c5c (diff) | |
initialize.mk: Git call in variable works with LD_LIBRARY_PATH
Until now, the '$(project-commit-hash)' Make variable of 'initialize.mk'
simply called 'git' to find the commit hash. However, due to one of the
recent software updates, we noticed that this command is no longer working
(and the project commit hash wasn't getting printed in the PDF)! The
problem was that Maneage's Git, couldn't find the 'libiconv' library that
it was built with.
With this commit, the '$(shell' command that calls Git, first exports
'LD_LIBRARY_PATH' to Maneage's software build directory. As a result, the
Git command can work and will report the commit as a LaTeX macro to be used
in the paper. To avoid relying on PATH outside of Make recipes, we now also
directly call the Git executable with Maneage.
Some other minor issues have been found and fixed in this commit:
- README-hacking.md: some minor edits and typo corrections.
- initialize.mk: the '$(curdir)' variable is now used in several places
that we were calling 'pwd'.
- versions.conf: 'xlsxio-version' now included with other programs. Until
now it was commented because GCC 11.1.0 had issues with it. However, GCC
11.2.0 doesn't have a problem any more, so it has been returned to the
list of all high-level programs.
- xorg.mk: used same format to comment recipe lines as the other Makefiles
(a '#' followed by a TAB).
- preamble-pgfplots.tex: lines to comment for building an EPS figure with
PGFPlots have been re-formatted to be more human-readable.
Diffstat (limited to 'reproduce/software/config')
| -rw-r--r-- | reproduce/software/config/versions.conf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/reproduce/software/config/versions.conf b/reproduce/software/config/versions.conf index 2a27ddd..34d074c 100644 --- a/reproduce/software/config/versions.conf +++ b/reproduce/software/config/versions.conf @@ -152,6 +152,7 @@ tides-version = 2.0 util-linux-version = 2.37.2 valgrind-version = 3.18.1 vim-version = 8.2 +xlsxio-version = 0.2.21 yaml-version = 0.2.5 # Xorg packages @@ -286,10 +287,6 @@ wheel-version = 0.37.0 # it. #healpix-version = 3.50 -# XLSX I/O (until version 0.2.29) crashes during compilation with GCC -# 11.1.0, so we are temporarily commenting it. -#xlsxio-version = 0.2.21 - # Setuptools-rust crash (https://savannah.nongnu.org/bugs/index.php?61731), # so it and its dependencies are being ignored: 'cryptography', and thus # 'secretstorage' and thus 'keyring' and thus 'astroquery'. |