From 9db9bbd8b5c420c0eb4839ffdc8bb6b566700c49 Mon Sep 17 00:00:00 2001 From: Christian Beer Date: Sun, 26 Aug 2018 15:40:47 +0200 Subject: [PATCH] Mac: disable usage of libidn2 by curl If libidn2 is installed curl will automatically use it. But since we build a static curl and have a shared libidn2 on the Travis VM this doesn't work. --- mac_build/buildcurl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index 135b28b7c4..76f40094e0 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -140,7 +140,7 @@ if [ "x${lprefix}" != "x" ]; then export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64" export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64" export CFLAGS="-isysroot ${SDKPATH} -arch x86_64" - PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --enable-shared=NO --host=x86_64 + PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --enable-shared=NO --without-libidn --without-libidn2 --host=x86_64 if [ $? -ne 0 ]; then return 1; fi else # Get the names of the current versions of c-ares and openssl from @@ -163,7 +163,7 @@ else export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64 -L${CURL_DIR}/../${opensslDirName} " export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -I${CURL_DIR}/../${opensslDirName}/include" export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -I${CURL_DIR}/../${opensslDirName}/include" - ./configure --enable-shared=NO --enable-ares="${libcares}" --host=x86_64 + ./configure --enable-shared=NO --enable-ares="${libcares}" --without-libidn --without-libidn2 --host=x86_64 if [ $? -ne 0 ]; then return 1; fi echo "" fi