From 215e54566074d95771925579d15c20764e8b288c Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Tue, 26 Jul 2022 19:28:30 +0100 Subject: [PATCH] `brew style` --- Library/Homebrew/build.rb | 8 ++++---- Library/Homebrew/cmd/install.rb | 4 ++-- Library/Homebrew/cmd/reinstall.rb | 4 ++-- Library/Homebrew/cmd/upgrade.rb | 4 ++-- Library/Homebrew/extend/ENV.rb | 2 +- Library/Homebrew/extend/os/linux/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/os/linux/extend/ENV/super.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/shared.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index aef1cc3df4..ec430e04ba 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -93,10 +93,10 @@ class Build 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, + formula: formula, + cc: args.cc, + build_bottle: args.build_bottle?, + bottle_arch: args.bottle_arch, debug_symbols: args.debug_symbols?, ) reqs.each do |req| diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 6848e982b5..6844ef124b 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -93,8 +93,8 @@ module Homebrew }], [:switch, "--debug-symbols", { depends_on: "--build-from-source", - description: "Generates debugging symbols during build. Source will be in temporary directory " \ - "which is retained. (see --keep-tmp)", + description: "Generate debug symbols on build. Source will be retained in a temporary directory. " \ + "(see --keep-tmp)", }], [:switch, "--build-bottle", { description: "Prepare the formula for eventual bottling during installation, skipping any " \ diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index bb8b4844cc..608eee3212 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -59,8 +59,8 @@ module Homebrew }], [:switch, "--debug-symbols", { depends_on: "--build-from-source", - description: "Generates debugging symbols during build. Source will be in temporary directory " \ - "which is retained. (see --keep-tmp)", + description: "Generate debug symbols on build. Source will be retained in a temporary directory. " \ + "(see --keep-tmp)", }], [:switch, "--display-times", { env: :display_install_times, diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 3496c7274b..49d5a783f2 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -70,8 +70,8 @@ module Homebrew }], [:switch, "--debug-symbols", { depends_on: "--build-from-source", - description: "Generates debugging symbols during build. Source will be in temporary directory " \ - "which is retained. (see --keep-tmp)", + description: "Generate debug symbols on build. Source will be retained in a temporary directory. " \ + "(see --keep-tmp)", }], [:switch, "--display-times", { env: :display_install_times, diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 40bb592a87..2b1182f71d 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -54,7 +54,7 @@ module EnvActivation 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, + debug_symbols: debug_symbols ) replace(tmp_env) diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/std.rb b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb index 73bc4e2a91..2b0c0b172a 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb @@ -13,7 +13,7 @@ module Stdenv generic_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols, + debug_symbols: debug_symbols ) prepend_path "CPATH", HOMEBREW_PREFIX/"include" diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb index 074f842099..8358986170 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb @@ -26,7 +26,7 @@ module Superenv generic_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols, + debug_symbols: debug_symbols ) self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2" self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb index 7db7a5f8fd..268932734f 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb @@ -15,7 +15,7 @@ module SharedEnvExtension 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, + 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 7368ec4696..699658bc8d 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -21,7 +21,7 @@ module Stdenv generic_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols, + 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 258970240e..c17240444f 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -110,7 +110,7 @@ module Superenv generic_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, - debug_symbols: debug_symbols, + debug_symbols: debug_symbols ) # Filter out symbols known not to be defined since GNU Autotools can't