Merge pull request #1701 from MikeMcQuaid/deprecate-std-superenv-stuff

ENV: deprecate old methods.

4 files changed, 8 insertions, 41 deletions

diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 14f9b81b8..403ea1978 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -82,10 +82,6 @@ module Stdenv
 
     old
   end
-  alias j1 deparallelize
-
-  # These methods are no-ops for compatibility.
-  %w[fast O4 Og].each { |opt| define_method(opt) {} }
 
   %w[O3 O2 O1 O0 Os].each do |opt|
     define_method opt do
@@ -110,13 +106,11 @@ module Stdenv
     super
     set_cpu_cflags "-march=nocona -mssse3"
   end
-  alias gcc_4_0_1 gcc_4_0
 
-  def gcc
+  def gcc_4_2
     super
     set_cpu_cflags
   end
-  alias gcc_4_2 gcc
 
   GNU_GCC_VERSIONS.each do |n|
     define_method(:"gcc-#{n}") do
@@ -144,13 +138,6 @@ module Stdenv
   end
   alias generic_no_optimization no_optimization
 
-  def libxml2
-  end
-
-  def x11
-  end
-  alias libpng x11
-
   # we've seen some packages fail to build when warnings are disabled!
   def enable_warnings
     remove_from_cflags "-w"
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index a75cba406..7503e8876 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -16,9 +16,7 @@ module Superenv
 
   # @private
   attr_accessor :keg_only_deps, :deps
-
   attr_accessor :x11
-  alias x11? x11
 
   def self.extended(base)
     base.keg_only_deps = []
@@ -263,7 +261,6 @@ module Superenv
 
     old
   end
-  alias j1 deparallelize
 
   def make_jobs
     self["MAKEFLAGS"] =~ /-\w*j(\d+)/
@@ -329,23 +326,9 @@ module Superenv
   def set_x11_env_if_installed
   end
 
+  # This method does nothing in superenv since there's no custom CFLAGS API
   # @private
-  def noop(*_args); end
-
-  # These methods are no longer necessary under superenv, but are needed to
-  # maintain an interface compatible with stdenv.
-  alias fast noop
-  alias O4 noop
-  alias Og noop
-  alias libxml2 noop
-  alias set_cpu_flags noop
-
-  # These methods provide functionality that has not yet been ported to
-  # superenv.
-  alias gcc_4_0_1 noop
-  alias minimal_optimization noop
-  alias no_optimization noop
-  alias enable_warnings noop
+  def set_cpu_flags; end
 end
 
 class Array
diff --git a/Library/Homebrew/extend/os/mac/development_tools.rb b/Library/Homebrew/extend/os/mac/development_tools.rb
index 8c0c48a51..1bb12a3d1 100644
--- a/Library/Homebrew/extend/os/mac/development_tools.rb
+++ b/Library/Homebrew/extend/os/mac/development_tools.rb
@@ -64,15 +64,15 @@ class DevelopmentTools
       case default_cc
       # if GCC 4.2 is installed, e.g. via Tigerbrew, prefer it
       # over the system's GCC 4.0
-      when /^gcc-4\.0/ then gcc_42_build_version ? :gcc : :gcc_4_0
-      when /^gcc/ then :gcc
+      when /^gcc-4\.0/ then gcc_4_2_build_version ? :gcc_4_2 : :gcc_4_0
+      when /^gcc/ then :gcc_4_2
       when "clang" then :clang
       else
         # guess :(
         if MacOS::Xcode.version >= "4.3"
           :clang
         else
-          :gcc
+          :gcc_4_2
         end
       end
     end
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 5f4a3e4aa..f97a2dbbb 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -1,4 +1,6 @@
 module Superenv
+  alias x11? x11
+
   # @private
   def self.bin
     return unless DevelopmentTools.installed?
@@ -120,9 +122,4 @@ module Superenv
   def no_weak_imports
     append "HOMEBREW_CCCFG", "w" if no_weak_imports_support?
   end
-
-  # These methods are no longer necessary under superenv, but are needed to
-  # maintain an interface compatible with stdenv.
-  alias macosxsdk noop
-  alias remove_macosxsdk noop
 end