diff options
| author | Prasenjit Saha <psaha@physik.uzh.ch> | 2019-06-28 11:15:48 +0200 |
|---|---|---|
| committer | Prasenjit Saha <psaha@physik.uzh.ch> | 2019-06-28 11:16:46 +0200 |
| commit | 73cd532901865fe0b3a53c3e526ab5f7bd7d3122 (patch) | |
| tree | a05b7907ac36ac2990616783bcea1b5787a09e32 /reproduce | |
| parent | 5761eecf6c9018f204c9b3a4e6b9313d24ae7d16 (diff) | |
Corrections to basic build
Several corrections were necessary in the basic build: 1) the
version of GCC on some systems includes an `_' which would cause
a crash when building the PDF. 2) libcharset had to be manually
added to the Git build.
Diffstat (limited to 'reproduce')
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/config/installation/TARGETS.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/config/installation/texlive.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/make/basic.mk | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index fe7b5ea..640ba2d 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -111,7 +111,7 @@ export LD_LIBRARY_PATH := $(installdir)/lib export LDFLAGS := -L$(installdir)/lib export SHELL := $(installdir)/bin/bash export CPPFLAGS := -I$(installdir)/include - +export TEXINPUTS := $(installdir)/texlive// diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index b9157f1..96d6d83 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -39,4 +39,4 @@ top-level-programs = gnuastro # Python libraries/modules. -top-level-python = astropy +# top-level-python = astropy diff --git a/reproduce/software/config/installation/texlive.mk b/reproduce/software/config/installation/texlive.mk index d68f94e..f0c7755 100644 --- a/reproduce/software/config/installation/texlive.mk +++ b/reproduce/software/config/installation/texlive.mk @@ -19,4 +19,4 @@ texlive-packages = tex fancyhdr ec newtx fontaxes xkeyval etoolbox xcolor \ setspace caption footmisc datetime fmtcount titlesec \ preprint ulem biblatex biber logreq pgf pgfplots fp \ - courier tex-gyre txfonts times csquotes + courier tex-gyre txfonts times csquotes kastrup diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 9628140..81e8512 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -844,8 +844,9 @@ $(ibidir)/libiconv: $(tdir)/libiconv-$(libiconv-version).tar.gz \ $(ibidir)/git: $(tdir)/git-$(git-version).tar.xz \ $(ibidir)/libiconv \ $(ibidir)/curl # Coreutils, so Git is built after it. + export LDFLAGS=-lcharset; \ $(call gbuild, $<, git-$(git-version), static, \ - --without-tcltk --with-shell=$(ibdir)/bash \ + --without-tcltk --with-shell=$(ibdir)/bash \ --with-iconv=$(idir), V=1) \ && echo "Git $(git-version)" > $@ |