ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MACOSX: Update osxcross

Browse Source 
We gain the proper fix for MacOS 11 SDK
This commit is contained in:
Le Philousophe
2020-12-25 19:50:13 +00:00
parent c5766b8016
commit e5ff6e5db9
7 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
master/platforms.py
+2 -2
View File
@@ -327,14 +327,14 @@ ios7()
def macosx():
platform = Platform("macosx")
platform.env["CXX"] = "ccache x86_64-apple-darwin21-c++"
platform.env["CXX"] = "ccache x86_64-apple-darwin20.2-c++"
# Put back worker CXXFLAGS
if "CXXFLAGS" in platform.env:
platform.env["CXXFLAGS"] += "${CXXFLAGS}"
# configure script doesn't compile discord check with proper flags
platform.env["DISCORD_LIBS"] = "-framework AppKit"
platform.configureargs.append("--host=x86_64-apple-darwin21")
platform.configureargs.append("--host=x86_64-apple-darwin20.2")
platform.buildconfigureargs = {
builds.ScummVMBuild: [ "--enable-static",
"--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
toolchains/apple-sdks/packages/xcode-extractor/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=7c090bd8cd4ad28cf332f1d02267630d8f333c19
OSXCROSS_VERSION=4287300a5c96397a2ee9ab3942e66578a1982031
export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
toolchains/macosx-common/packages/osxcross-clang/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=7c090bd8cd4ad28cf332f1d02267630d8f333c19
OSXCROSS_VERSION=4287300a5c96397a2ee9ab3942e66578a1982031
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/macosx-common/packages/osxcross/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=7c090bd8cd4ad28cf332f1d02267630d8f333c19
OSXCROSS_VERSION=4287300a5c96397a2ee9ab3942e66578a1982031
export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
toolchains/macosx/Dockerfile.m4
+2 -3
View File
@@ -2,12 +2,11 @@ m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.2)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl
m4_dnl We provide specific patch to add 11.1 support
m4_define(`PATCH_OSXCROSS',`')m4_dnl
m4_dnl m4_define(`PATCH_OSXCROSS',`')m4_dnl
m4_include(`macosx.m4')m4_dnl
# This package isn't available on older MacOS X
toolchains/macosx/packages/osxcross/patches/99_add_11.1_support.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/build.sh b/build.sh
index a5a1aa3..73541a8 100755
--- a/build.sh
+++ b/build.sh
@@ -41,6 +41,7 @@ case $SDK_VERSION in
10.15*) TARGET=darwin19; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=0; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
10.16*) TARGET=darwin20; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
11.0*) TARGET=darwin20; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
+ 11.1*) TARGET=darwin21; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
*) echo "Unsupported SDK"; exit 1 ;;
esac
workers/macosx/Dockerfile.m4
+2 -3
View File
@@ -3,10 +3,9 @@ m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.2)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl
m4_dnl We provide specific patch to add 11.1 support
m4_define(`PATCH_OSXCROSS',`')m4_dnl
m4_dnl m4_define(`PATCH_OSXCROSS',`')m4_dnl
m4_include(`macosx.m4')m4_dnl