Skip to content

Commit 76f2261

Browse files
committed
Disable curl's runtime linking check
1 parent b815205 commit 76f2261

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

mklove/modules/configure.libcurl

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ function install_source {
5959
# curl's configure has a runtime check where a program is built
6060
# with all libs linked and then executed, since mklove's destdir
6161
# is outside the standard ld.so search path this runtime check will
62-
# fail due to missing libraries. We circumvent this by passing
63-
# a modified LD_LIBRARY_PATH with our destdir lib dirs prepended.
64-
local _save_ldp="$LD_LIBRARY_PATH"
65-
export LD_LIBRARY_PATH="${destdir}/usr/lib:${destdir}/usr/lib64:$LD_LIBRARY_PATH"
62+
# fail due to missing libraries.
63+
# We patch curl's configure file to skip this check altogether.
64+
if ! mkl_patch libcurl 0000 ; then
65+
return 1
66+
fi
6667

67-
# Also clear out LIBS to not interfer with lib detection process.
68+
# Clear out LIBS to not interfer with lib detection process.
6869
LIBS="" ./configure \
6970
--with-openssl \
7071
--enable-static \
@@ -75,15 +76,13 @@ function install_source {
7576
--disable-file \
7677
--disable-gopher \
7778
--disable-imap \
78-
--disable-imaps \
7979
--disable-mqtt \
8080
--disable-pop3 \
8181
--disable-rtsp \
8282
--disable-smb \
8383
--disable-smtp \
8484
--disable-telnet \
8585
--disable-tftp \
86-
--disable-ssh \
8786
--disable-manual \
8887
--disable-ldap{,s} \
8988
--disable-libcurl-option \
@@ -92,9 +91,6 @@ function install_source {
9291
make DESTDIR="${destdir}" prefix=/usr install
9392
local ret=$?
9493

95-
# Restore
96-
export LD_LIBRARY_PATH="$_save_ldp"
97-
9894
if [[ $MKL_DISTRO == osx ]]; then
9995
mkl_mkvar_append "libcurl" LIBS "-framework CoreFoundation -framework SystemConfiguration"
10096
fi
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/configure 2022-06-27 12:15:45.000000000 +0200
2+
+++ b/configure 2022-06-27 12:17:20.000000000 +0200
3+
@@ -33432,7 +33432,7 @@
4+
5+
6+
7+
- if test "x$cross_compiling" != xyes; then
8+
+ if false; then
9+
10+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking run-time libs availability" >&5
11+
printf %s "checking run-time libs availability... " >&6; }

0 commit comments

Comments
 (0)