From 9ba9922c65778bfee5b939c7ddfab5851feb3e7a Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Mon, 3 Apr 2023 14:49:39 +0000 Subject: [PATCH] Bug 1825401 - Part 1. Update OpenH264 MacOSX toolchain configuration to match Firefox. r=jmaher In bug 1680152, we bumped the minimum OSX version from 10.11 to 10.12 (for Firefox 85). In bug 1812215, we bumped the default OSX SDK to 13.0 (for Firefox 111). This also resolves build issues for missing headers. Differential Revision: https://phabricator.services.mozilla.com/D174009 --- taskcluster/ci/openh264-plugin/kind.yml | 4 ++-- testing/mozharness/configs/openh264/macosx64-aarch64.py | 6 ++++-- testing/mozharness/configs/openh264/macosx64.py | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/taskcluster/ci/openh264-plugin/kind.yml b/taskcluster/ci/openh264-plugin/kind.yml index e43423b24932..db9f06f777e2 100644 --- a/taskcluster/ci/openh264-plugin/kind.yml +++ b/taskcluster/ci/openh264-plugin/kind.yml @@ -99,7 +99,7 @@ jobs: - linux64-clang - linux64-dump_syms - linux64-nasm - - macosx64-sdk-10.11 + - macosx64-sdk-toolchain macosx64-aarch64/opt: attributes: build_platform: macosx64-aarch64 @@ -123,7 +123,7 @@ jobs: - linux64-cctools-port - linux64-clang - linux64-dump_syms - - macosx64-sdk-11.0 + - macosx64-sdk-toolchain win32/opt: attributes: build_platform: win32 diff --git a/testing/mozharness/configs/openh264/macosx64-aarch64.py b/testing/mozharness/configs/openh264/macosx64-aarch64.py index c6262d360bae..e7e4c3a2a9a8 100644 --- a/testing/mozharness/configs/openh264/macosx64-aarch64.py +++ b/testing/mozharness/configs/openh264/macosx64-aarch64.py @@ -22,13 +22,15 @@ config = { "partial_env": { "CFLAGS": ( "-target aarch64-apple-darwin -mcpu=apple-a12 " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format( + "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk " + "-mmacosx-version-min=11.0".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ), "LDFLAGS": ( "-target aarch64-apple-darwin -mcpu=apple-a12 " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format( + "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk " + "-mmacosx-version-min=11.0".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ), diff --git a/testing/mozharness/configs/openh264/macosx64.py b/testing/mozharness/configs/openh264/macosx64.py index 3416173a86ec..98445c5d2a95 100644 --- a/testing/mozharness/configs/openh264/macosx64.py +++ b/testing/mozharness/configs/openh264/macosx64.py @@ -22,15 +22,15 @@ config = { "partial_env": { "CXXFLAGS": ( "-target x86_64-apple-darwin " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk " - "-mmacosx-version-min=10.11".format( + "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk " + "-mmacosx-version-min=10.12".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ), "LDFLAGS": ( "-target x86_64-apple-darwin " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk " - "-mmacosx-version-min=10.11".format( + "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk " + "-mmacosx-version-min=10.12".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ),