From e4ee5d0ed979988ad707f2d9468499fdeb90da7e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 13 Dec 2023 17:37:48 +0000 Subject: [PATCH] subversion: fix MacOS references. Needed after https://github.com/Homebrew/brew/pull/16306. Co-authored-by: Bo Anderson --- Formula/s/subversion.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/s/subversion.rb b/Formula/s/subversion.rb index 79db33d76909..84c3daab0246 100644 --- a/Formula/s/subversion.rb +++ b/Formula/s/subversion.rb @@ -172,7 +172,7 @@ def install ] # preserve compatibility with macOS 12.0–12.2 - args.unshift "--enable-sqlite-compatibility-version=3.36.0" if MacOS.version == :monterey + args.unshift "--enable-sqlite-compatibility-version=3.36.0" if OS.mac? && MacOS.version == :monterey inreplace "Makefile.in", "toolsdir = @bindir@/svn-tools", @@ -196,7 +196,7 @@ def install perl_core = Pathname.new(perl_archlib)/"CORE" perl_extern_h = perl_core/"EXTERN.h" - unless perl_extern_h.exist? + if OS.mac? && !perl_extern_h.exist? # No EXTERN.h, maybe it's system perl perl_version = Utils.safe_popen_read(perl.to_s, "--version")[/v(\d+\.\d+)(?:\.\d+)?/, 1] perl_core = MacOS.sdk_path/"System/Library/Perl"/perl_version/"darwin-thread-multi-2level/CORE"