From eab322946a25f4f3a99f1d6fdbd3dbfb59c325dc Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 20 Sep 2024 12:31:15 +0100 Subject: [PATCH] formula: fix alias/generic/prepend std_cmake_args issue. Seen in: https://github.com/Homebrew/homebrew-core/pull/191090#issuecomment-2363215204 There's a missing signature issue here due to the `generic_*` aliasing we're doing. With prepend, though: this is no longer needed and we can use `super` instead which is more idiomatic and nicer overall. This pattern should probably be applied in other places but: let's try this targetting fix for here first. --- Library/Homebrew/extend/os/mac/formula.rb | 2 +- Library/Homebrew/formula.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/formula.rb b/Library/Homebrew/extend/os/mac/formula.rb index 4731717dfe475..c802e318064e8 100644 --- a/Library/Homebrew/extend/os/mac/formula.rb +++ b/Library/Homebrew/extend/os/mac/formula.rb @@ -21,7 +21,7 @@ def valid_platform? ).returns(T::Array[String]) } def std_cmake_args(install_prefix: prefix, install_libdir: "lib", find_framework: "LAST") - args = generic_std_cmake_args(install_prefix:, install_libdir:, find_framework:) + args = super # Avoid false positives for clock_gettime support on 10.11. # CMake cache entries for other weak symbols may be added here as needed. diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index f70f0860e34b3..48749f0ac3186 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1822,7 +1822,6 @@ def std_cmake_args(install_prefix: prefix, install_libdir: "lib", find_framework -DBUILD_TESTING=OFF ] end - alias generic_std_cmake_args std_cmake_args # Standard parameters for configure builds. sig {