Skip to content

Commit

Permalink
Merge pull request #196660 from Homebrew/[email protected]
Browse files Browse the repository at this point in the history
[email protected]: drop protobuf workaround
  • Loading branch information
BrewTestBot authored Nov 5, 2024
2 parents 4d60ab8 + 6a86a64 commit 0111eb9
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions Formula/m/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,6 @@ 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
elsif DevelopmentTools.clang_build_version <= 1400
ENV.llvm_clang
# Work around failure mixing newer `llvm` headers with older Xcode's libc++:
Expand Down Expand Up @@ -127,7 +119,7 @@ def install
system "cmake", "--build", "build"
system "cmake", "--install", "build"

(prefix/"mysql-test").cd do
cd prefix/"mysql-test" do
system "./mysql-test-run.pl", "status", "--vardir=#{buildpath}/mysql-test-vardir"
end

Expand Down

0 comments on commit 0111eb9

Please sign in to comment.