Merge pull request #3060 from ShanghaiTimes/master

Disabling external libraries
BOINC · Mar 16, 2019 · 0e8775c · 0e8775c
2 parents 64b78df + 64431be
commit 0e8775c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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