diff options
| -rw-r--r-- | Library/Formula/avidemux.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/boost.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/hardware.rb | 10 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/hardware.rb | 14 |
5 files changed, 19 insertions, 13 deletions
diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb index f5ecd000a..d4966935a 100644 --- a/Library/Formula/avidemux.rb +++ b/Library/Formula/avidemux.rb @@ -43,7 +43,7 @@ class Avidemux < Formula # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 - if MacOS.version <= :leopard or Hardware.is_32_bit? && Hardware.cpu_type == :intel && ENV.compiler == :clang + if MacOS.version <= :leopard or Hardware.is_32_bit? && Hardware::CPU.intel? && ENV.compiler == :clang inreplace 'cmake/admFFmpegBuild.cmake', '${CMAKE_INSTALL_PREFIX})', '${CMAKE_INSTALL_PREFIX} --extra-cflags=-mdynamic-no-pic)' diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb index 3e713779f..40048a953 100644 --- a/Library/Formula/boost.rb +++ b/Library/Formula/boost.rb @@ -126,7 +126,7 @@ class Boost < Formula # The context library is implemented as x86_64 ASM, so it # won't build on PPC or 32-bit builds # see https://github.com/mxcl/homebrew/issues/17646 - if Hardware::CPU.type == :ppc || Hardware::CPU.is_32_bit? || build.universal? + if Hardware::CPU.ppc? || Hardware::CPU.is_32_bit? || build.universal? without_libraries << "context" # The coroutine library depends on the context library. without_libraries << "coroutine" @@ -178,7 +178,7 @@ class Boost < Formula EOS end - if Hardware::CPU.type == :ppc || Hardware::CPU.is_32_bit? || build.universal? + if Hardware::CPU.ppc? || Hardware::CPU.is_32_bit? || build.universal? s += <<-EOS.undent Building of Boost.Context and Boost.Coroutine is disabled as they are diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index 9ecea9f4d..09f616e22 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -102,7 +102,7 @@ class Ffmpeg < Formula # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 - ENV.append_to_cflags "-mdynamic-no-pic" if Hardware.is_32_bit? && Hardware.cpu_type == :intel && ENV.compiler == :clang + ENV.append_to_cflags "-mdynamic-no-pic" if Hardware.is_32_bit? && Hardware::CPU.intel? && ENV.compiler == :clang system "./configure", *args diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb index 0a52d10db..a47de5247 100644 --- a/Library/Homebrew/hardware.rb +++ b/Library/Homebrew/hardware.rb @@ -30,6 +30,14 @@ class Hardware def is_64_bit? bits == 64 end + + def intel? + type == :intel + end + + def ppc? + type == :ppc + end end if OS.mac? @@ -53,7 +61,7 @@ class Hardware end def self.oldest_cpu - if Hardware::CPU.type == :intel + if Hardware::CPU.intel? if Hardware::CPU.is_64_bit? :core2 else diff --git a/Library/Homebrew/os/mac/hardware.rb b/Library/Homebrew/os/mac/hardware.rb index 53a9a6463..888a99b1b 100644 --- a/Library/Homebrew/os/mac/hardware.rb +++ b/Library/Homebrew/os/mac/hardware.rb @@ -27,9 +27,8 @@ module MacCPUs end def family - if type == :intel - @intel_family ||= `/usr/sbin/sysctl -n hw.cpufamily`.to_i - case @intel_family + if intel? + case @intel_family ||= `/usr/sbin/sysctl -n hw.cpufamily`.to_i when 0x73d67300 # Yonah: Core Solo/Duo :core when 0x426f69ef # Merom: Core 2 Duo @@ -49,9 +48,8 @@ module MacCPUs else :dunno end - elsif type == :ppc - @ppc_family ||= `/usr/sbin/sysctl -n hw.cpusubtype`.to_i - case @ppc_family + elsif ppc? + case @ppc_family ||= `/usr/sbin/sysctl -n hw.cpusubtype`.to_i when 9 :g3 # PowerPC 750 when 10 @@ -81,11 +79,11 @@ module MacCPUs end def arch_32_bit - type == :intel ? :i386 : :ppc + intel? ? :i386 : :ppc end def arch_64_bit - type == :intel ? :x86_64 : :ppc64 + intel? ? :x86_64 : :ppc64 end # Returns an array that's been extended with ArchitectureListExtension, |