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

APPLE: Upgrade SDK

Browse Source 
Patches are refreshed too
This commit is contained in:
Le Philousophe
2022-04-17 12:06:05 +00:00
parent 0795b0064b
commit 1c595f464b
13 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildbot-config/platforms.py
+2 -2
View File
@@ -435,7 +435,7 @@ def macosx_arm64():
# configure script doesn't compile discord check with proper flags
platform.env["DISCORD_LIBS"] = "-framework AppKit"
platform.configureargs.append("--host=aarch64-apple-darwin21.1")
platform.configureargs.append("--host=aarch64-apple-darwin21.4")
platform.buildconfigureargs = {
builds.ScummVMBuild: [ "--enable-static",
"--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
@@ -476,7 +476,7 @@ def macosx_x86_64():
# configure script doesn't compile discord check with proper flags
platform.env["DISCORD_LIBS"] = "-framework AppKit"
platform.configureargs.append("--host=x86_64-apple-darwin21.1")
platform.configureargs.append("--host=x86_64-apple-darwin21.4")
platform.buildconfigureargs = {
builds.ScummVMBuild: [ "--enable-static",
"--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
toolchains/apple-sdks/Dockerfile.m4
+1 -1
View File
@@ -26,7 +26,7 @@ COPY Xcode_`'I386_XCODE_VERSION.xip* ${PACKAGES_LOCATION}
local_package(xcode-extractor, , PACKAGE=Xcode_`'I386_XCODE_VERSION.xip SDK_PLATFORMS="MacOSX")
# Extract latest MacOS X and iPhoneOS SDK
m4_define(`XCODE_VERSION', 13.1)
m4_define(`XCODE_VERSION', 13.3.1)
COPY Xcode_`'XCODE_VERSION.xip* ${PACKAGES_LOCATION}
local_package(xcode-extractor, , PACKAGE=Xcode_`'XCODE_VERSION.xip SDK_PLATFORMS="MacOSX iPhoneOS")
toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From d88b2d1df97177a334da0ce018c8d5a1a238ee58 Mon Sep 17 00:00:00 2001
From 1e0d4e04ec026f47c315c71b329d509108f5fc61 Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 24 Jan 2021 19:15:52 +0100
Subject: [PATCH 1/3] Set versions
toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From cc7d84facea6dd2c667369254352579c58370abc Mon Sep 17 00:00:00 2001
From 1ff5e04e8529561aaaa6e96062fb056a4e9f3fc6 Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 24 Jan 2021 19:18:24 +0100
Subject: [PATCH 2/3] Accept piped data and avoid intermediate files
toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From e3d40fa4d3e6af9f7ac344187d0ec339f9ac093f Mon Sep 17 00:00:00 2001
From f0d8919cead8f867b6b2ed0414c41ffa38ab028c Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 24 Jan 2021 19:19:14 +0100
Subject: [PATCH 3/3] Generate all SDKs and not only MacOSX
toolchains/iphone/Dockerfile.m4
+1 -1
View File
@@ -2,7 +2,7 @@ FROM toolchains/apple-sdks AS sdks
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`IPHONE_SDK_VERSION',15.0)m4_dnl
m4_define(`IPHONE_SDK_VERSION',15.4)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
m4_include(`paths.m4')m4_dnl
toolchains/macosx-arm64/Dockerfile.m4
+2 -2
View File
@@ -1,8 +1,8 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.4)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.16)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl
toolchains/macosx-common/packages/osxcross/patches/0001-Set-versions.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From a3f6756160f981fab48ef13fe3e4c32c238d83f6 Mon Sep 17 00:00:00 2001
From c8ced7eae2ce46ec3d867b3b28a25a9a0c164a59 Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 24 Jan 2021 19:15:52 +0100
Subject: [PATCH 1/2] Set versions
@@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Set versions
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/gen_sdk_package_pbzx.sh b/tools/gen_sdk_package_pbzx.sh
index d741550..f2ae9de 100755
index 5ca46e4..7cda817 100755
--- a/tools/gen_sdk_package_pbzx.sh
+++ b/tools/gen_sdk_package_pbzx.sh
@@ -22,7 +22,7 @@ pushd $BUILD_DIR &>/dev/null
@@ -35,5 +35,5 @@ index a09ec64..cf0d370 100644
if [ $f_res -eq 1 ]; then
pushd $CURRENT_BUILD_PROJECT_NAME/xar &>/dev/null
--
2.25.1
2.32.0
toolchains/macosx-common/packages/osxcross/patches/0002-Add-12.3-SDK-support.patch
+24
View File
@@ -0,0 +1,24 @@
From eef3ff455a161bd6f1e2681cb4b07889cabdf50e Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 17 Apr 2022 13:43:52 +0200
Subject: [PATCH 2/2] Add 12.3 SDK support
---
build.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.sh b/build.sh
index bbcff0c..c1ef2e6 100755
--- a/build.sh
+++ b/build.sh
@@ -45,6 +45,7 @@ case $SDK_VERSION in
11.2*) TARGET=darwin20.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
11.3*) TARGET=darwin20.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
12.0*) TARGET=darwin21.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
+ 12.3*) TARGET=darwin21.4; 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
--
2.32.0
toolchains/macosx-x86_64/Dockerfile.m4
+2 -2
View File
@@ -1,8 +1,8 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.4)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
workers/iphone/Dockerfile.m4
+1 -1
View File
@@ -2,7 +2,7 @@ FROM toolchains/iphone AS toolchain
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`IPHONE_SDK_VERSION',15.0)m4_dnl
m4_define(`IPHONE_SDK_VERSION',15.4)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
m4_include(`paths.m4')m4_dnl
workers/macosx-arm64/Dockerfile.m4
+2 -2
View File
@@ -1,9 +1,9 @@
m4_define(`TOOLCHAIN',macosx-arm64)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.4)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.16)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl
workers/macosx-x86_64/Dockerfile.m4
+2 -2
View File
@@ -1,9 +1,9 @@
m4_define(`TOOLCHAIN',macosx-x86_64)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-14)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.4)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