From 5ca2992fa886c6f63712b05d0d6198ee8838e7f8 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 11 Nov 2024 22:37:32 -0500 Subject: [PATCH] mysql@8.0: drop protobuf workaround --- Formula/m/mysql@8.0.rb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Formula/m/mysql@8.0.rb b/Formula/m/mysql@8.0.rb index 2360e2273da7..0a55556711db 100644 --- a/Formula/m/mysql@8.0.rb +++ b/Formula/m/mysql@8.0.rb @@ -24,7 +24,7 @@ class MysqlAT80 < Formula depends_on "bison" => :build depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "abseil" depends_on "icu4c@76" depends_on "libevent" @@ -59,18 +59,8 @@ def datadir end def install - if OS.linux? - # Disable ABI checking - inreplace "cmake/abi_check.cmake", "RUN_ABI_CHECK 1", "RUN_ABI_CHECK 0" - - # Work around build issue with Protobuf 22+ on Linux - # Ref: https://bugs.mysql.com/bug.php?id=113045 - # Ref: https://bugs.mysql.com/bug.php?id=115163 - inreplace "cmake/protobuf.cmake" do |s| - s.gsub! 'IF(APPLE AND WITH_PROTOBUF STREQUAL "system"', 'IF(WITH_PROTOBUF STREQUAL "system"' - s.gsub! ' INCLUDE REGEX "${HOMEBREW_HOME}.*")', ' INCLUDE REGEX "libabsl.*")' - end - end + # Disable ABI checking + inreplace "cmake/abi_check.cmake", "RUN_ABI_CHECK 1", "RUN_ABI_CHECK 0" if OS.linux? icu4c = deps.find { |dep| dep.name.match?(/^icu4c(@\d+)?$/) } .to_formula