diff options
| author | Jack Nagel | 2013-11-26 20:23:19 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-26 20:23:19 -0600 |
| commit | 91a69c6e2c20fe5e170a06171dd08bf986235f71 (patch) | |
| tree | ce2fa3460d62e26e4d61df3402982a8c5bb14d0c /Library/Formula | |
| parent | f26bea19ab4ce843849fbcd67f4f6f0428257690 (diff) | |
| download | homebrew-91a69c6e2c20fe5e170a06171dd08bf986235f71.tar.bz2 | |
Add Hardware::CPU.intel? and Hardware::CPU.ppc?
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/avidemux.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/boost.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 2 |
3 files changed, 4 insertions, 4 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 |