From 88166dddf436e4607098478a586035a560922393 Mon Sep 17 00:00:00 2001
From: Zeta <53486764+Apprentice-Alchemist@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:37:05 +0100
Subject: [PATCH 1/2] [ci] Fix macos-14 pkgconf issue. (#11833)

---
 .github/workflows/main.yml         | 1 +
 extra/github-actions/build-mac.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d50e82b1383..5ade4d748eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -501,6 +501,7 @@ jobs:
         run: |
           set -ex
           brew update
+          brew uninstall --force pkg-config
           brew bundle --file=tests/Brewfile --no-upgrade
           cpanm IPC::System::Simple
           cpanm String::ShellQuote
diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
index 9098e76fc6c..3085340f997 100644
--- a/extra/github-actions/build-mac.yml
+++ b/extra/github-actions/build-mac.yml
@@ -7,6 +7,7 @@
   run: |
     set -ex
     brew update
+    brew uninstall --force pkg-config
     brew bundle --file=tests/Brewfile --no-upgrade
     cpanm IPC::System::Simple
     cpanm String::ShellQuote

From a25a3c642414084080204b5a858f8fd533d342f2 Mon Sep 17 00:00:00 2001
From: Chris Speciale <christopher.gaf@gmail.com>
Date: Fri, 22 Nov 2024 07:41:57 -0500
Subject: [PATCH 2/2] Sys: Clarify `cpuTime` documentation (#11834)

The existing documentation can be confusing. I think its easy to assume that this returns the time since the process was started, especially if you dont understand how the native api's calculate it. It easy to mistake that this simply might be the wall time since the cpu was running and end up with unreliable behavior when sleep is introduced to your thread.

The new documentation makes this pretty clear I think.
---
 std/Sys.hx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/std/Sys.hx b/std/Sys.hx
index afd84a2383f..d18aa6dd97b 100644
--- a/std/Sys.hx
+++ b/std/Sys.hx
@@ -139,8 +139,10 @@ extern class Sys {
 	static function time():Float;
 
 	/**
-		Gives the most precise timestamp value available (in seconds),
-		but only accounts for the actual time spent running on the CPU for the current thread/process.
+    		Returns CPU time consumed by the current process or thread, measured in seconds.
+		This value only includes the actual time the CPU has actively spent executing 
+		instructions for the process/thread and excludes idle or sleep time. The precision 
+		and behavior may vary depending on the platform and underlying implementation.
 	**/
 	static function cpuTime():Float;