From 64431beb3c0b4f95bde044389d987cef2e19b59d Mon Sep 17 00:00:00 2001 From: ShanghaiTimes Date: Thu, 14 Mar 2019 14:12:52 +0000 Subject: [PATCH] Disabling external libraries This fix causes two libraries to be built without including two external libraries that get found when already installed on the Mac by Homebrew for example. --- mac_build/buildcurl.sh | 4 ++-- mac_build/buildfreetype.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index e3ba9304354..88fbc4978eb 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -142,7 +142,7 @@ if [ "x${lprefix}" != "x" ]; then export CPPFLAGS="" export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -stdlib=libc++" export CFLAGS="-isysroot ${SDKPATH} -arch x86_64" - PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --enable-shared=NO --without-libidn --without-libidn2 --host=x86_64 + PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --enable-shared=NO --without-libidn --without-libidn2 --without-nghttp2 --host=x86_64 if [ $? -ne 0 ]; then return 1; fi else # Get the names of the current versions of c-ares and openssl from @@ -166,7 +166,7 @@ else export CPPFLAGS="" export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -stdlib=libc++ -I${CURL_DIR}/../${opensslDirName}/include" export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -I${CURL_DIR}/../${opensslDirName}/include" - ./configure --enable-shared=NO --enable-ares="${libcares}" --without-libidn --without-libidn2 --host=x86_64 + ./configure --enable-shared=NO --enable-ares="${libcares}" --without-libidn --without-libidn2 --without-nghttp2 --host=x86_64 if [ $? -ne 0 ]; then return 1; fi echo "" fi diff --git a/mac_build/buildfreetype.sh b/mac_build/buildfreetype.sh index f66eb935357..b7a56185f05 100644 --- a/mac_build/buildfreetype.sh +++ b/mac_build/buildfreetype.sh @@ -140,7 +140,7 @@ export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED= export SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.7 -./configure --enable-shared=NO --prefix=${lprefix} --host=x86_64 +./configure --enable-shared=NO --prefix=${lprefix} --without-png --host=x86_64 if [ $? -ne 0 ]; then return 1; fi if [ "${doclean}" = "yes" ]; then