diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2018-12-02 01:25:57 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2018-12-02 06:14:26 +0000 |
| commit | 2a3304cfb832d2f9548bb869f5a44a3412a1c3f9 (patch) | |
| tree | b23f2887bd06ad44771e6818aef6fe341b890701 /reproduce/src/make/initialize.mk | |
| parent | ccfb8d41ad851432e73a82b486a29707d0faa405 (diff) | |
Wget and OpenSSL now installed as a basic dependency
The TeX Live installer needs Wget to operate smoothly, especially on recent
Mac OS systems that don't have Wget pre-installed. Also, it would be good
for the pipeline to have its own downloader. So with this commit, the
pipeline also installs Wget and OpenSSL which is a dependency.
Many other small changes/fixes were done in this process.
Diffstat (limited to 'reproduce/src/make/initialize.mk')
| -rw-r--r-- | reproduce/src/make/initialize.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk index db27289..b2b5407 100644 --- a/reproduce/src/make/initialize.mk +++ b/reproduce/src/make/initialize.mk @@ -167,7 +167,7 @@ lvcheck = idir=$(BDIR)/dependencies/installed/include; \ ver="$(strip $(2))"; \ name="$(strip $(3))"; \ macro="$(strip $(4))"; \ - v=$$(awk '$$1=="\#define" && /'$$ver'/{print "y";exit 0}' $$f);\ + v=$$(awk '/^\#/&&/define/&&/'$$ver'/{print "y";exit 0}' $$f); \ if [ x$$v != xy ]; then \ echo; echo "PIPELINE ERROR: Not linking with $$name $$ver"; \ echo; exit 1; \ @@ -210,10 +210,12 @@ $(mtexdir)/initialize.tex: | $(mtexdir) coreutilsversion) $(call pvcheck, lzip, $(lzip-version), Lzip, lzipversion) $(call pvcheck, make, $(make-version), GNU Make, makeversion) + $(call pvcheck, pkg-config, $(pkgconfig-version), pkg-config, \ pkgconfigversion) $(call pvcheck, sed, $(sed-version), GNU SED, sedversion) $(call pvcheck, tar, $(tar-version), GNU Tar, tarversion) + $(call pvcheck, wget, $(wget-version), GNU Wget, wgetversion) $(call pvcheck, which, $(which-version), GNU Which, whichversion) $(call pvcheck, xz, $(xz-version), XZ Utils, xzversion) @@ -248,6 +250,8 @@ $(mtexdir)/initialize.tex: | $(mtexdir) ########## libjpeg not yet checked. $(call lvcheck, git2/version.h, $(libgit2-version), Libgit2, \ libgitwoversion) + $(call lvcheck, openssl/opensslv.h, $(openssl-version), OpenSSL, \ + opensslversion) $(call lvcheck, tiffvers.h, $(libtiff-version), Libtiff, \ libtiffversion) $(call lvcheck, wcslib/wcsconfig.h, $(wcslib-version), WCSLIB, \ |