From c1458b4c10e940f3bea05aedf0a6e88b3dba0d7a Mon Sep 17 00:00:00 2001
From: mkruskal-google <mkruskal@google.com>
Date: Thu, 30 Jun 2022 12:37:05 -0700
Subject: [PATCH 1/6] Disabling broken mac php tests

---
 kokoro/macos/php7.0_mac/build.sh | 3 ++-
 kokoro/macos/php7.3_mac/build.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kokoro/macos/php7.0_mac/build.sh b/kokoro/macos/php7.0_mac/build.sh
index e5a37e30eee0..c6717e071b7f 100755
--- a/kokoro/macos/php7.0_mac/build.sh
+++ b/kokoro/macos/php7.0_mac/build.sh
@@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc
 
-./tests.sh php7.0_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.0_mac
diff --git a/kokoro/macos/php7.3_mac/build.sh b/kokoro/macos/php7.3_mac/build.sh
index 2d2f679da2ca..2688ddbf65f0 100755
--- a/kokoro/macos/php7.3_mac/build.sh
+++ b/kokoro/macos/php7.3_mac/build.sh
@@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc
 
-./tests.sh php7.3_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.3_mac

From e4395e705b0d20bc565d3bcbffc2143dad6f11a9 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 7 Sep 2022 09:18:08 -0700
Subject: [PATCH 2/6] Adding explicit arena.h include

---
 python/google/protobuf/pyext/message.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc
index 920c17d8d138..78bcc99cc0b9 100644
--- a/python/google/protobuf/pyext/message.cc
+++ b/python/google/protobuf/pyext/message.cc
@@ -49,6 +49,7 @@
 #ifndef Py_TYPE
 #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
 #endif
+#include <google/protobuf/arena.h>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/stubs/logging.h>
 #include <google/protobuf/io/coded_stream.h>

From e622dc1061b6b2486ff593002ebaad9f5b6a77ef Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 7 Sep 2022 11:37:51 -0700
Subject: [PATCH 3/6] Revert "Adding explicit arena.h include"

This reverts commit e4395e705b0d20bc565d3bcbffc2143dad6f11a9.
---
 python/google/protobuf/pyext/message.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc
index 78bcc99cc0b9..920c17d8d138 100644
--- a/python/google/protobuf/pyext/message.cc
+++ b/python/google/protobuf/pyext/message.cc
@@ -49,7 +49,6 @@
 #ifndef Py_TYPE
 #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
 #endif
-#include <google/protobuf/arena.h>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/stubs/logging.h>
 #include <google/protobuf/io/coded_stream.h>

From ae77ebd11c3bbd56e38804fffb3a54b0d1318a08 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 7 Sep 2022 12:01:41 -0700
Subject: [PATCH 4/6] Removing extra protobuf directory

---
 kokoro/release/python/macos/config.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kokoro/release/python/macos/config.sh b/kokoro/release/python/macos/config.sh
index 1b0a302e4cb3..afcde95858ab 100644
--- a/kokoro/release/python/macos/config.sh
+++ b/kokoro/release/python/macos/config.sh
@@ -21,10 +21,6 @@ function install_virtualenv {
 }
 
 function pre_build {
-    # Any stuff that you need to do before you start building the wheels
-    # Runs in the root directory of this repository.
-    pushd protobuf
-
     # Build protoc
     ./autogen.sh
     ./configure

From dbedf7003dc3c5fb8af9c1f0f29f1b269d1ef9ff Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 7 Sep 2022 12:15:14 -0700
Subject: [PATCH 5/6] Revert "Removing extra protobuf directory"

This reverts commit ae77ebd11c3bbd56e38804fffb3a54b0d1318a08.
---
 kokoro/release/python/macos/config.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kokoro/release/python/macos/config.sh b/kokoro/release/python/macos/config.sh
index afcde95858ab..1b0a302e4cb3 100644
--- a/kokoro/release/python/macos/config.sh
+++ b/kokoro/release/python/macos/config.sh
@@ -21,6 +21,10 @@ function install_virtualenv {
 }
 
 function pre_build {
+    # Any stuff that you need to do before you start building the wheels
+    # Runs in the root directory of this repository.
+    pushd protobuf
+
     # Build protoc
     ./autogen.sh
     ./configure

From 1bac3077eb04c811e86c82ad4ac3b1085ce72e3f Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 7 Sep 2022 12:19:21 -0700
Subject: [PATCH 6/6] Uninstall system protobuf to prevent version conflicts

---
 kokoro/macos/prepare_build_macos_rc            | 4 ++++
 kokoro/release/python/macos/build_artifacts.sh | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index 75b50c09f93c..8f99f105face 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -6,6 +6,10 @@ set -eux
 
 export HOMEBREW_PREFIX=$(brew --prefix)
 
+##
+# Remove any pre-existing protobuf installation.
+brew uninstall protobuf
+
 ##
 # Select Xcode version
 
diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh
index a72ee6733f1c..296bd9aef399 100755
--- a/kokoro/release/python/macos/build_artifacts.sh
+++ b/kokoro/release/python/macos/build_artifacts.sh
@@ -2,6 +2,9 @@
 
 set -ex
 
+# Remove any pre-existing protobuf installation.
+brew uninstall protobuf
+
 # change to repo root
 pushd $(dirname $0)/../../../..