From cd9fe97c551d4e9b5f0a702a1382a6ccbe494773 Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Sat, 30 Jul 2022 11:10:26 +0100 Subject: [PATCH] Improve style --- Library/Homebrew/build.rb | 18 ++++-------------- Library/Homebrew/extend/ENV.rb | 15 +++------------ Library/Homebrew/extend/ENV/shared.rb | 10 ++-------- Library/Homebrew/extend/ENV/std.rb | 10 ++-------- Library/Homebrew/extend/ENV/super.rb | 10 ++-------- .../Homebrew/extend/os/linux/extend/ENV/std.rb | 17 ++++------------- .../extend/os/linux/extend/ENV/super.rb | 17 ++++------------- .../extend/os/mac/extend/ENV/shared.rb | 5 ++--- .../Homebrew/extend/os/mac/extend/ENV/std.rb | 7 ++----- .../Homebrew/extend/os/mac/extend/ENV/super.rb | 15 ++++----------- 10 files changed, 29 insertions(+), 95 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index ec430e04ba..0722cb060c 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -78,13 +78,8 @@ class Build ENV.keg_only_deps = keg_only_deps ENV.deps = formula_deps ENV.run_time_deps = run_time_deps - ENV.setup_build_environment( - formula: formula, - cc: args.cc, - build_bottle: args.build_bottle?, - bottle_arch: args.bottle_arch, - debug_symbols: args.debug_symbols?, - ) + ENV.setup_build_environment(formula: formula, cc: args.cc, build_bottle: args.build_bottle?, + bottle_arch: args.bottle_arch, debug_symbols: args.debug_symbols?) reqs.each do |req| req.modify_build_environment( env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch, @@ -92,13 +87,8 @@ class Build end deps.each(&:modify_build_environment) else - ENV.setup_build_environment( - formula: formula, - cc: args.cc, - build_bottle: args.build_bottle?, - bottle_arch: args.bottle_arch, - debug_symbols: args.debug_symbols?, - ) + ENV.setup_build_environment(formula: formula, cc: args.cc, build_bottle: args.build_bottle?, + bottle_arch: args.bottle_arch, debug_symbols: args.debug_symbols?) reqs.each do |req| req.modify_build_environment( env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch, diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index dd3145954a..54b293ee87 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -41,22 +41,13 @@ module EnvActivation _block: T.proc.returns(T.untyped), ).returns(T.untyped) } - def with_build_environment( - env: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - debug_symbols: false, - &_block - ) + def with_build_environment(env: nil, cc: nil, build_bottle: false, bottle_arch: nil, debug_symbols: false, &_block) old_env = to_hash.dup tmp_env = to_hash.dup.extend(EnvActivation) T.cast(tmp_env, EnvActivation).activate_extensions!(env: env) T.cast(tmp_env, T.any(Superenv, Stdenv)) - .setup_build_environment( - cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, - debug_symbols: debug_symbols - ) + .setup_build_environment(cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + debug_symbols: debug_symbols) replace(tmp_env) begin diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index f31400733c..95bede7d4a 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -43,14 +43,8 @@ module SharedEnvExtension debug_symbols: T.nilable(T::Boolean), ).void } - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) @formula = formula @cc = cc @build_bottle = build_bottle diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index a1ee227f2f..37d4c7779f 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -24,14 +24,8 @@ module Stdenv debug_symbols: T.nilable(T::Boolean), ).void } - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) super self["HOMEBREW_ENV"] = "std" diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 619f6bb02f..8f9a8330c9 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -58,14 +58,8 @@ module Superenv debug_symbols: T.nilable(T::Boolean), ).void } - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) super send(compiler) diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/std.rb b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb index 2b0c0b172a..58c741e1d4 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb @@ -2,19 +2,10 @@ # frozen_string_literal: true module Stdenv - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) - generic_setup_build_environment( - formula: formula, cc: cc, build_bottle: build_bottle, - bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) + generic_setup_build_environment(formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + testing_formula: testing_formula, debug_symbols: debug_symbols) prepend_path "CPATH", HOMEBREW_PREFIX/"include" prepend_path "LIBRARY_PATH", HOMEBREW_PREFIX/"lib" diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb index 8358986170..9dbac81d0e 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb @@ -15,19 +15,10 @@ module Superenv end # @private - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) - generic_setup_build_environment( - formula: formula, cc: cc, build_bottle: build_bottle, - bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) + generic_setup_build_environment(formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + testing_formula: testing_formula, debug_symbols: debug_symbols) self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2" self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula) diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb index 268932734f..019c3091f7 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb @@ -13,9 +13,8 @@ module SharedEnvExtension debug_symbols: false ) generic_shared_setup_build_environment( - formula: formula, cc: cc, build_bottle: build_bottle, - bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols + formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + testing_formula: testing_formula, debug_symbols: debug_symbols ) # Normalise the system Perl version used, where multiple may be available diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 699658bc8d..1c255a151e 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -18,11 +18,8 @@ module Stdenv testing_formula: false, debug_symbols: false ) - generic_setup_build_environment( - formula: formula, cc: cc, build_bottle: build_bottle, - bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols - ) + generic_setup_build_environment(formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + testing_formula: testing_formula, debug_symbols: debug_symbols) append "LDFLAGS", "-Wl,-headerpad_max_install_names" diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index c17240444f..4c7d767fbb 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -85,14 +85,8 @@ module Superenv end # @private - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) sdk = formula ? MacOS.sdk_for_formula(formula) : MacOS.sdk is_xcode_sdk = sdk&.source == :xcode @@ -108,9 +102,8 @@ module Superenv end generic_setup_build_environment( - formula: formula, cc: cc, build_bottle: build_bottle, - bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols + formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, + testing_formula: testing_formula, debug_symbols: debug_symbols ) # Filter out symbols known not to be defined since GNU Autotools can't