Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Christian Beer 2018-08-26 15:40:47 +02:00
parent 69a96eb892
commit 9db9bbd8b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mac_build/buildcurl.sh
View File

@ -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