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/dependencies-build-rules.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/dependencies-build-rules.mk')
| -rw-r--r-- | reproduce/src/make/dependencies-build-rules.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/reproduce/src/make/dependencies-build-rules.mk b/reproduce/src/make/dependencies-build-rules.mk index f613975..d1cc5dc 100644 --- a/reproduce/src/make/dependencies-build-rules.mk +++ b/reproduce/src/make/dependencies-build-rules.mk @@ -61,11 +61,16 @@ gbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \ if ! tar xf $(1); then echo; echo "Tar error"; exit 1; fi; \ cd $(2); \ \ + if [ -f configure ]; then confscript=configure; \ + elif [ -f config ]; then confscript=config; \ + fi; \ + \ if [ -f $(ibdir)/bash ]; then \ - sed configure -e's|\#\! /bin/sh|\#\! $(ibdir)/bash|' \ - -e's|\#\!/bin/sh|\#\! $(ibdir)/bash|'> configure-t; \ - mv configure-t configure; \ - chmod +x configure; \ + sed $$confscript -e's|\#\! /bin/sh|\#\! $(ibdir)/bash|' \ + -e's|\#\!/bin/sh|\#\! $(ibdir)/bash|' \ + > tmp-$$confscript; \ + mv tmp-$$confscript $$confscript; \ + chmod +x $$confscript; \ shellop="SHELL=$(ibdir)/bash"; \ elif [ -f /bin/bash ]; then shellop="SHELL=/bin/bash"; \ else shellop="SHELL=/bin/sh"; \ @@ -76,7 +81,7 @@ gbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \ else configop="$$shellop --prefix=$(idir)"; \ fi; \ \ - ./configure $(4) $$configop && \ + ./$$confscript $(4) $$configop && \ make "$$shellop" $(5) && \ $$check && \ make "$$shellop" install && \ |