aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2018-12-02 01:25:57 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2018-12-02 06:14:26 +0000
commit2a3304cfb832d2f9548bb869f5a44a3412a1c3f9 (patch)
treeb23f2887bd06ad44771e6818aef6fe341b890701 /configure
parentccfb8d41ad851432e73a82b486a29707d0faa405 (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 'configure')
-rwxr-xr-xconfigure36
1 files changed, 33 insertions, 3 deletions
diff --git a/configure b/configure
index c3c11f7..c660e82 100755
--- a/configure
+++ b/configure
@@ -566,7 +566,32 @@ rm -f $oprog $cprog
-# Inform the user that the build process is starting
+# See if we need the dynamic-linker (-ldl)
+# ----------------------------------------
+#
+# Some programs (like Wget) need dynamic loading (using `libdl'). On
+# GNU/Linux systems, we'll need the `-ldl' flag to link such programs. But
+# Mac OS doesn't need any explicit calling. So we'll check here to use in
+# the building of programs.
+oprog=$depdir/ldl-test
+cprog=$depdir/ldl-test.c
+cat > $cprog <<EOF
+#include <stdio.h>
+#include <dlfcn.h>
+int
+main(void) {
+ void *handle=dlopen ("/lib/CEDD_LIB.so.6", RTLD_LAZY);
+ return 0;
+}
+EOF
+if gcc $cprog -o$oprog &> /dev/null; then needs_ldl=no; else needs_ldl=yes; fi
+rm -f $oprog $cprog
+
+
+
+
+
+# inform the user that the build process is starting
# -------------------------------------------------
if [ $printnotice = yes ]; then
tsec=10
@@ -603,8 +628,13 @@ fi
if which nproc > /dev/null 2>/dev/null; then numthreads=$(nproc --all);
else numthreads=2;
fi
+#######################################
+#static_build=no
+#######################################
make -f reproduce/src/make/dependencies-basic.mk \
- static_build=$static_build -j$numthreads
+ static_build=$static_build \
+ needs_ldl=$needs_ldl \
+ -j$numthreads
@@ -637,7 +667,7 @@ numthreads=$($instdir/bin/nproc)
# and it is only necessary to build the PDF. So we don't want to stop the
# pipeline if its not present.
texlive_result=$(cat $instdir/bin/texlive-ready-tlmgr)
-if [ x$texlive_result = x"NOT!" ]; then
+if [ x"$texlive_result" = x"NOT!" ]; then
cat <<EOF
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!