From 2a3304cfb832d2f9548bb869f5a44a3412a1c3f9 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sun, 2 Dec 2018 01:25:57 +0000
Subject: 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.
---
 reproduce/src/make/dependencies-build-rules.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'reproduce/src/make/dependencies-build-rules.mk')

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 &&                                          \
-- 
cgit v1.2.1