mirror of https://github.com/BOINC/boinc.git
Mac: change minimum MacOS version to 10.10 (required for wxWidgets 3.1.5)
This commit is contained in:
parent
689dc20ede
commit
78614d9c1a
|
@ -3901,7 +3901,6 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
INFOPLIST_FILE = "Installer-Info.plist";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.9;
|
||||
OTHER_CFLAGS = (
|
||||
"-D_THREAD_SAFE",
|
||||
"-D_DEBUG",
|
||||
|
@ -3923,7 +3922,6 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
INFOPLIST_FILE = "Installer-Info.plist";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.9;
|
||||
OTHER_CFLAGS = (
|
||||
"-D_THREAD_SAFE",
|
||||
"-DNDEBUG",
|
||||
|
@ -3969,7 +3967,7 @@
|
|||
"-D_THREAD_SAFE",
|
||||
"-D__WXMAC__",
|
||||
"-D_DEBUG",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
"OTHER_CFLAGS[arch=arm64]" = (
|
||||
|
@ -3981,7 +3979,7 @@
|
|||
"-D_THREAD_SAFE",
|
||||
"-D__WXMAC__",
|
||||
"-D_DEBUG",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
"OTHER_CFLAGS[arch=x86_64]" = (
|
||||
|
@ -3993,7 +3991,7 @@
|
|||
"-D_THREAD_SAFE",
|
||||
"-D__WXMAC__",
|
||||
"-D_DEBUG",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
|
@ -4048,7 +4046,7 @@
|
|||
"-DSANDBOX",
|
||||
"-D_NDEBUG",
|
||||
"-DBUILDING_MANAGER",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
"OTHER_CFLAGS[arch=arm64]" = (
|
||||
|
@ -4062,7 +4060,7 @@
|
|||
"-DSANDBOX",
|
||||
"-D_NDEBUG",
|
||||
"-DBUILDING_MANAGER",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
"OTHER_CFLAGS[arch=x86_64]" = (
|
||||
|
@ -4076,7 +4074,7 @@
|
|||
"-DSANDBOX",
|
||||
"-D_NDEBUG",
|
||||
"-DBUILDING_MANAGER",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=101000",
|
||||
"-DwxADJUST_MINSIZE=0",
|
||||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
|
@ -4528,7 +4526,7 @@
|
|||
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
|
||||
HEADER_SEARCH_PATHS = "../lib/**";
|
||||
LIBRARY_STYLE = STATIC;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.9;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.10;
|
||||
OTHER_CFLAGS = (
|
||||
"-D_THREAD_SAFE",
|
||||
"-DNDEBUG",
|
||||
|
@ -4704,7 +4702,7 @@
|
|||
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
|
||||
HEADER_SEARCH_PATHS = "../lib/**";
|
||||
LIBRARY_STYLE = STATIC;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.9;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.10;
|
||||
OTHER_CFLAGS = (
|
||||
"-D_THREAD_SAFE",
|
||||
"-D_DEBUG",
|
||||
|
|
|
@ -156,10 +156,10 @@ SDKPATH=`xcodebuild -version -sdk macosx Path`
|
|||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export CPPFLAGS=""
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
./configure --prefix="${lprefix}" --enable-shared=NO --disable-freetypetest --with-ft-prefix="${libftpath}" --host=x86_64
|
||||
|
@ -192,11 +192,11 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
|
|||
|
||||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.9 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.10 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
./configure --prefix="${lprefix}" --enable-shared=NO --disable-freetypetest --with-ft-prefix="${libftpath}" --host=arm
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# This file is part of BOINC.
|
||||
# http://boinc.berkeley.edu
|
||||
# Copyright (C) 2020 University of California
|
||||
# Copyright (C) 2021 University of California
|
||||
#
|
||||
# BOINC is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License
|
||||
|
@ -42,6 +42,7 @@
|
|||
# Updated 8/4/20 TO build Apple Silicon / arm64 and x86_64 Universal binary
|
||||
# Updated 5/18/21 for compatibility with zsh
|
||||
# Updated 9/30/21 for wxCocoa 3.1.5
|
||||
# Updated 10/18/21 to add -Werror=unguarded-availability compiler flag
|
||||
#
|
||||
## This script requires OS 10.6 or later
|
||||
##
|
||||
|
@ -264,8 +265,14 @@ else
|
|||
## "-include unistd.h" is a workaround for a problem under Xcode 12 Beta
|
||||
## $(ARCHS_STANDARD) builds Universal Binary (x86_64 & arm64) library under
|
||||
## Xcode versions that can, otherwise it builds only the X86_64 library.
|
||||
|
||||
## The "-Werror=unguarded-availability" compiler flag generates an error if
|
||||
## there is an unguarded API not available in our Deployment Target. This
|
||||
## helps ensure wxWidgets won't try to use unavailable APIs on older Mac
|
||||
## systems supported by BOINC.
|
||||
|
||||
set -o pipefail
|
||||
xcodebuild -project build/osx/wxcocoa.xcodeproj -target static -configuration Release $doclean build ARCHS="\$(ARCHS_STANDARD)" ONLY_ACTIVE_ARCH="NO" MACOSX_DEPLOYMENT_TARGET="10.9" GCC_C_LANGUAE_STANDARD="compiler-default" CLANG_CXX_LANGUAGE_SANDARD="c++0x" CLANG_CXX_LIBRARY="libc++" OTHER_CFLAGS="-Wall -Wundef -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0 -DPNG_ARM_NEON_OPT=0 -DNDEBUG -fvisibility=hidden -include unistd.h" OTHER_CPLUSPLUSFLAGS="-Wall -Wundef -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0 -DPNG_ARM_NEON_OPT=0 -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden" GCC_PREPROCESSOR_DEFINITIONS="WXBUILDING __WXOSX_COCOA__ __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 wxUSE_UNICODE_WCHAR=0 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" | $beautifier; retval=$?
|
||||
xcodebuild -project build/osx/wxcocoa.xcodeproj -target static -configuration Release $doclean build ARCHS="\$(ARCHS_STANDARD)" ONLY_ACTIVE_ARCH="NO" MACOSX_DEPLOYMENT_TARGET="10.10" GCC_C_LANGUAE_STANDARD="compiler-default" CLANG_CXX_LANGUAGE_SANDARD="c++0x" CLANG_CXX_LIBRARY="libc++" OTHER_CFLAGS="-Wall -Wundef -Werror=unguarded-availability -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0 -DPNG_ARM_NEON_OPT=0 -DNDEBUG -fvisibility=hidden -include unistd.h" OTHER_CPLUSPLUSFLAGS="-Wall -Wundef -Werror=unguarded-availability -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0 -DPNG_ARM_NEON_OPT=0 -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden" GCC_PREPROCESSOR_DEFINITIONS="WXBUILDING __WXOSX_COCOA__ __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 wxUSE_UNICODE_WCHAR=0 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" | $beautifier; retval=$?
|
||||
if [ ${retval} -ne 0 ]; then return 1; fi
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
# copy library and headers to $lprefix
|
||||
|
@ -321,7 +328,7 @@ else
|
|||
## $(ARCHS_STANDARD) builds Universal Binary (x86_64 & arm64) library under
|
||||
## Xcode versions that can, otherwise it builds only the X86_64 library.
|
||||
set -o pipefail
|
||||
xcodebuild -project build/osx/wxcocoa.xcodeproj -target static -configuration Debug build ARCHS="\$(ARCHS_STANDARD)" ONLY_ACTIVE_ARCH="NO" MACOSX_DEPLOYMENT_TARGET="10.9" GCC_C_LANGUAE_STANDARD="compiler-default" CLANG_CXX_LANGUAGE_SANDARD="c++0x" CLANG_CXX_LIBRARY="libc++" OTHER_CFLAGS="-Wall -Wundef -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DPNG_ARM_NEON_OPT=0 -DDEBUG -fvisibility=hidden -include unistd.h" OTHER_CPLUSPLUSFLAGS="-Wall -Wundef -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DPNG_ARM_NEON_OPT=0 -DDEBUG -fvisibility=hidden -fvisibility-inlines-hidden" GCC_PREPROCESSOR_DEFINITIONS="WXBUILDING __WXOSX_COCOA__ __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 wxUSE_UNICODE_WCHAR=0 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" | $beautifier; retval=$?
|
||||
xcodebuild -project build/osx/wxcocoa.xcodeproj -target static -configuration Debug build ARCHS="\$(ARCHS_STANDARD)" ONLY_ACTIVE_ARCH="NO" MACOSX_DEPLOYMENT_TARGET="10.10" GCC_C_LANGUAE_STANDARD="compiler-default" CLANG_CXX_LANGUAGE_SANDARD="c++0x" CLANG_CXX_LIBRARY="libc++" OTHER_CFLAGS="-Wall -Wundef -Werror=unguarded-availability -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DPNG_ARM_NEON_OPT=0 -DDEBUG -fvisibility=hidden -include unistd.h" OTHER_CPLUSPLUSFLAGS="-Wall -Wundef -Werror=unguarded-availability -fno-strict-aliasing -fno-common -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DPNG_ARM_NEON_OPT=0 -DDEBUG -fvisibility=hidden -fvisibility-inlines-hidden" GCC_PREPROCESSOR_DEFINITIONS="WXBUILDING __WXOSX_COCOA__ __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 wxUSE_UNICODE_WCHAR=0 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" | $beautifier; retval=$?
|
||||
if [ ${retval} -ne 0 ]; then return 1; fi
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
# copy debug library to $PREFIX
|
||||
|
|
|
@ -179,12 +179,12 @@ fi
|
|||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export CPPFLAGS=""
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -mmacosx-version-min=10.9 -arch x86_64"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -mmacosx-version-min=10.10 -arch x86_64"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=1090
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=1090
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=101000
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=101000
|
||||
|
||||
./configure --prefix=${lprefix} --enable-shared=NO --host=x86_64
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
@ -207,12 +207,12 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
|
|||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export CPPFLAGS=""
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -target arm64-apple-macos10.9 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -mmacosx-version-min=10.9 -target arm64-apple-macos10.9"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -target arm64-apple-macos10.10 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=partial-availability -mmacosx-version-min=10.10 -target arm64-apple-macos10.10"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=1090
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=1090
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=101000
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=101000
|
||||
|
||||
./configure --prefix=${lprefix} --enable-shared=NO --host=arm
|
||||
if [ $? -ne 0 ]; then
|
||||
|
|
|
@ -215,15 +215,15 @@ fi
|
|||
export PATH=/usr/local/bin:$PATH
|
||||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=1090
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=1090
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
export MAC_OS_X_VERSION_MAX_ALLOWED=101000
|
||||
export MAC_OS_X_VERSION_MIN_REQUIRED=101000
|
||||
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.9 -arch x86_64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.10 -arch x86_64"
|
||||
PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --disable-shared --with-secure-transport --host=x86_64-apple-darwin
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
else
|
||||
|
@ -248,9 +248,9 @@ else
|
|||
fi
|
||||
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64, "
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.9 -arch x86_64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.10 -arch x86_64"
|
||||
./configure --disable-shared --with-secure-transport --enable-ares="${libcares}" --host=x86_64-apple-darwin
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
echo ""
|
||||
|
@ -280,15 +280,15 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
|
|||
## cp -f ../"${caresDirName}"/ares_build_arm.h /tmp/installed-c-ares/include/ares_build.h
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.9 -target arm64-apple-macos"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.10 -target arm64-apple-macos"
|
||||
PKG_CONFIG_PATH="${lprefix}/lib/pkgconfig" ./configure --prefix=${lprefix} --enable-ares --disable-shared --with-secure-transport --host=arm-apple-darwin
|
||||
else
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.9 -target arm64-apple-macos"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -mmacosx-version-min=10.10 -target arm64-apple-macos"
|
||||
./configure --disable-shared --with-secure-transport --enable-ares="${libcares}" --host=arm-apple-darwin
|
||||
|
||||
echo ""
|
||||
|
|
|
@ -164,11 +164,11 @@ rm -fR "../freetype_install/"
|
|||
##
|
||||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
|
||||
./configure --enable-shared=NO --prefix=${lprefix} --enable-freetype-config --without-png --host=x86_64
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
@ -186,11 +186,11 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
|
|||
|
||||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.9 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.10 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
|
||||
./configure --enable-shared=NO --prefix=${lprefix} --enable-freetype-config --without-png --host=arm
|
||||
if [ $? -ne 0 ]; then
|
||||
|
|
|
@ -207,10 +207,10 @@ echo ""
|
|||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export CPPFLAGS=""
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.9 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -arch x86_64 -mmacosx-version-min=10.10 -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
export LIBRARY_PATH="${SDKPATH}/usr/lib"
|
||||
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
|
@ -234,11 +234,11 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
|
|||
|
||||
export CC="${GCCPATH}";export CXX="${GPPPATH}"
|
||||
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.9 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.9 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"
|
||||
export CPPFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CXXFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -target arm64-apple-macos -mmacosx-version-min=10.10 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export CFLAGS="-isysroot ${SDKPATH} -Werror=unguarded-availability -mmacosx-version-min=10.10 -target arm64-apple-macos -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000"
|
||||
export SDKROOT="${SDKPATH}"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.10
|
||||
export LIBRARY_PATH="${SDKPATH}/usr/lib"
|
||||
|
||||
if [ "x${lprefix}" != "x" ]; then
|
||||
|
|
Loading…
Reference in New Issue