From c1a2d2ec29314975e725021ffe4334926dbaa56c Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Wed, 7 Sep 2022 13:49:32 -0700
Subject: [PATCH] Fix python release on macos (#10512)

* Disabling broken mac php tests

* Adding explicit arena.h include

* Revert "Adding explicit arena.h include"

This reverts commit e4395e705b0d20bc565d3bcbffc2143dad6f11a9.

* Removing extra protobuf directory

* Revert "Removing extra protobuf directory"

This reverts commit ae77ebd11c3bbd56e38804fffb3a54b0d1318a08.

* 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)/../../../..