Use `version.major` for GCC version suffix #59485

SeekingMeaning · 2020-08-11T20:49:40Z

Have you followed the guidelines for contributing?
Have you checked that there aren't other open pull requests for the same formula update/change?
Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
Does your build pass brew audit --strict <formula> (after doing brew install <formula>)?

~~Requires Homebrew/brew#8183~~
~~Now waiting for new brew version > 2.4.11~~
Can be merged as of version 2.4.12

augustus: replace private method call #58520, dynare: replace private method call #58522, gromacs: replace private method call #58524, imake: replace private method call #58525, kahip: replace private method call #58526, lcov: replace private method call #58527 - replace private method call
gcc: Fix version_suffix #58558 - Fix version_suffix
augustus: Get GCC version with public method #58973 - Get GCC version with public method

gromgit · 2020-08-13T01:44:38Z

SeekingMeaning

irb(main):001:0> gcc = Formula["gcc"]

SeekingMeaning · 2020-08-21T07:05:36Z

Formula/augustus.rb

@@ -40,7 +40,7 @@ def install
    # to upstream in 2016 (see https://github.com/nextgenusfs/funannotate/issues/3).
    # See also https://github.com/Gaius-Augustus/Augustus/issues/64
    cd "src" do
-      with_env("HOMEBREW_CC" => Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].linked_version.to_s.slice(/\d+/)}") do
+      with_env("HOMEBREW_CC" => Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].installed_version.major}") do


irb(main):003:0> gcc.linked_version.to_s.slice(/\d+/) => "10" irb(main):004:0> gcc.installed_version.major => #<Version::NumericToken 10>

SeekingMeaning · 2020-08-21T07:06:28Z

Formula/gromacs.rb

-      -DCMAKE_C_COMPILER=gcc-#{Formula["gcc"].version_suffix}
-      -DCMAKE_CXX_COMPILER=g++-#{Formula["gcc"].version_suffix}
+      -DCMAKE_C_COMPILER=gcc-#{Formula["gcc"].installed_version.major}
+      -DCMAKE_CXX_COMPILER=g++-#{Formula["gcc"].installed_version.major}


irb(main):006:0> gcc.version_suffix => "10" irb(main):007:0> gcc.installed_version.major => #<Version::NumericToken 10>

SeekingMeaning · 2020-08-21T07:06:37Z

Formula/imake.rb

@@ -52,7 +52,7 @@ def install
  test do
    # Use pipe_output because the return code is unimportant here.
    output = pipe_output("#{bin}/imake -v -s/dev/null -f/dev/null -T/dev/null 2>&1")
-    gcc_major_ver = Formula["gcc"].version_suffix
+    gcc_major_ver = Formula["gcc"].installed_version.major


irb(main):006:0> gcc.version_suffix => "10" irb(main):007:0> gcc.installed_version.major => #<Version::NumericToken 10>

SeekingMeaning · 2020-08-21T07:06:50Z

Formula/kahip.rb

-    ENV["CC"] = Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].version_suffix}"
-    ENV["CXX"] = Formula["gcc"].opt_bin/"g++-#{Formula["gcc"].version_suffix}"
+    ENV["CC"] = Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].installed_version.major}"
+    ENV["CXX"] = Formula["gcc"].opt_bin/"g++-#{Formula["gcc"].installed_version.major}"


irb(main):006:0> gcc.version_suffix => "10" irb(main):007:0> gcc.installed_version.major => #<Version::NumericToken 10>

SeekingMeaning · 2020-08-21T07:06:54Z

Formula/lcov.rb

-    gcc = Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].version_suffix}"
-    gcov = Formula["gcc"].opt_bin/"gcov-#{Formula["gcc"].version_suffix}"
+    gcc = Formula["gcc"].opt_bin/"gcc-#{Formula["gcc"].installed_version.major}"
+    gcov = Formula["gcc"].opt_bin/"gcov-#{Formula["gcc"].installed_version.major}"


irb(main):006:0> gcc.version_suffix => "10" irb(main):007:0> gcc.installed_version.major => #<Version::NumericToken 10>

SeekingMeaning · 2020-08-21T07:10:10Z

Formula/gcc@5.rb

@@ -75,7 +75,7 @@ def install
    # C, C++, ObjC and Fortran compilers are always built
    languages = %w[c c++ fortran objc obj-c++]

-    version_suffix = version.to_s.slice(/\d/)
+    version_suffix = version.major.to_s


irb(main):016:0> Formula["gcc@5"].version.to_s.slice(/\d/) => "5" irb(main):017:0> Formula["gcc@5"].version.major.to_s => "5" irb(main):018:0> Formula["gcc@5"].version.major => #<Version::NumericToken 5>

SeekingMeaning · 2020-08-21T07:10:17Z

Formula/gcc@6.rb

@@ -44,7 +44,7 @@ def install
    # C, C++, ObjC, Fortran compilers are always built
    languages = %w[c c++ objc obj-c++ fortran]

-    version_suffix = version.to_s.slice(/\d/)
+    version_suffix = version.major.to_s


irb(main):020:0> Formula["gcc@6"].version.to_s.slice(/\d/) => "6" irb(main):021:0> Formula["gcc@6"].version.major.to_s => "6" irb(main):022:0> Formula["gcc@6"].version.major => #<Version::NumericToken 6>

SeekingMeaning · 2020-08-21T07:10:28Z

Formula/gcc@7.rb

@@ -31,7 +31,7 @@ def install
    # GCC will suffer build errors if forced to use a particular linker.
    ENV.delete "LD"

-    version_suffix = version.to_s.slice(/\d/)
+    version_suffix = version.major.to_s


irb(main):024:0> Formula["gcc@7"].version.to_s.slice(/\d/) => "7" irb(main):025:0> Formula["gcc@7"].version.major.to_s => "7" irb(main):026:0> Formula["gcc@7"].version.major => #<Version::NumericToken 7>

SeekingMeaning · 2020-08-21T07:10:34Z

Formula/gcc@8.rb

@@ -31,7 +31,7 @@ def install
    # GCC will suffer build errors if forced to use a particular linker.
    ENV.delete "LD"

-    version_suffix = version.to_s.slice(/\d/)
+    version_suffix = version.major.to_s


irb(main):028:0> Formula["gcc@8"].version.to_s.slice(/\d/) => "8" irb(main):029:0> Formula["gcc@8"].version.major.to_s => "8" irb(main):030:0> Formula["gcc@8"].version.major => #<Version::NumericToken 8>

SeekingMeaning · 2020-08-21T07:11:20Z

Formula/gcc@9.rb

@@ -32,6 +32,8 @@ def install
    # GCC will suffer build errors if forced to use a particular linker.
    ENV.delete "LD"

+    version_suffix = version.major.to_s


irb(main):032:0> Formula["gcc@9"].version.major.to_s => "9" irb(main):033:0> Formula["gcc@9"].version.major => #<Version::NumericToken 9>

SeekingMeaning added do not merge CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. labels Aug 11, 2020

SeekingMeaning mentioned this pull request Aug 11, 2020

version: add major, minor, patch methods Homebrew/brew#8183

Merged

6 tasks

SeekingMeaning removed the do not merge label Aug 17, 2020

SeekingMeaning marked this pull request as ready for review August 17, 2020 17:06

SeekingMeaning marked this pull request as draft August 17, 2020 17:54

SeekingMeaning added 14 commits August 17, 2020 11:20

gcc@4.9: use version.major_minor for version suffix

d1dff79

gcc@5: use version.major for version suffix

037e0c2

gcc@6: use version.major for version suffix

cf177eb

gcc@7: use version.major for version suffix

ff4e8ee

gcc@8: use version.major for version suffix

6e36a02

gcc@9: use version.major for version suffix

e08b29b

gcc: use version.major for version suffix

a270d8e

augustus: use installed_version.major for gcc version suffix

6e67f45

dynare: use installed_version.major for gcc version suffix

d36b3c1

gromacs: use installed_version.major for gcc version suffix

f8a4b6a

imake: use installed_version.major for gcc version suffix

10af96d

kahip: use installed_version.major for gcc version suffix

b20710d

lcov: use installed_version.major for gcc version suffix

76872eb

pipgrip: use installed_version.major for gcc version suffix

39e4789

SeekingMeaning force-pushed the gcc/version-suffix branch from 7ad2b75 to 39e4789 Compare August 17, 2020 18:20

SeekingMeaning marked this pull request as ready for review August 17, 2020 18:21

SeekingMeaning mentioned this pull request Aug 17, 2020

Use version.major/minor/patch #59797

Merged

5 tasks

SeekingMeaning added do not merge and removed CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. labels Aug 20, 2020

SeekingMeaning commented Aug 21, 2020

View reviewed changes

SMillerDev approved these changes Aug 21, 2020

View reviewed changes

SeekingMeaning merged commit 3217bca into Homebrew:master Aug 21, 2020

SeekingMeaning deleted the gcc/version-suffix branch August 21, 2020 16:35

SeekingMeaning removed the do not merge label Aug 21, 2020

SeekingMeaning mentioned this pull request Aug 21, 2020

language/java: check installed openjdk version instead of latest version Homebrew/brew#8428

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `version.major` for GCC version suffix #59485

Use `version.major` for GCC version suffix #59485

SeekingMeaning commented Aug 11, 2020 •

edited

Loading

gromgit commented Aug 13, 2020

SeekingMeaning left a comment

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

SeekingMeaning Aug 21, 2020

Use version.major for GCC version suffix #59485

Use version.major for GCC version suffix #59485

Conversation

SeekingMeaning commented Aug 11, 2020 • edited Loading

gromgit commented Aug 13, 2020

SeekingMeaning left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Use `version.major` for GCC version suffix #59485

Use `version.major` for GCC version suffix #59485

SeekingMeaning commented Aug 11, 2020 •

edited

Loading