wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #36364 from MikeMcQuaid/xcode-installed-check

Browse source 
Remove unnecessary Xcode.installed? checks.
This commit is contained in:
Mike McQuaid 2019-01-24 14:22:26 +00:00 committed by GitHub
parent 317d39d0ba
commit 5e1a03c66e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Formula/anttweakbar.rb
View file

@ -29,8 +29,7 @@ class Anttweakbar < Formula
# namespace" and Xcode 8 issue on El Capitan "error: missing ',' between
# enumerators"
if DevelopmentTools.clang_build_version >= 900 ||
(MacOS.version == :el_capitan && MacOS::Xcode.installed? &&
MacOS::Xcode.version >= "8.0")
(MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0")
ENV.delete("SDKROOT")
end

2
Formula/argyll-cms.rb
View file

@ -23,7 +23,7 @@ class ArgyllCms < Formula
def install
# dyld: lazy symbol binding failed: Symbol not found: _clock_gettime
# Reported 20 Aug 2017 to graeme AT argyllcms DOT com
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "numlib/numsup.c", "CLOCK_MONOTONIC", "UNDEFINED_GIBBERISH"
end

2
Formula/baresip.rb
View file

@ -16,7 +16,7 @@ class Baresip < Formula
def install
# baresip doesn't like the 10.11 SDK when on Yosemite
if MacOS::Xcode.installed? && MacOS::Xcode.version.to_i >= 7
if MacOS::Xcode.version.to_i >= 7
ENV.delete("SDKROOT")
ENV.delete("HOMEBREW_SDKROOT") if MacOS::Xcode.without_clt?
end

3
Formula/bitcoin.rb
View file

@ -28,8 +28,7 @@ class Bitcoin < Formula
depends_on "zeromq"
def install
if MacOS.version == :el_capitan && MacOS::Xcode.installed? &&
MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
ENV.delete("SDKROOT")
end

2
Formula/chezscheme.rb
View file

@ -16,7 +16,7 @@ class Chezscheme < Formula
def install
# dyld: lazy symbol binding failed: Symbol not found: _clock_gettime
# Reported 20 Feb 2017 https://github.com/cisco/ChezScheme/issues/146
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
inreplace "c/stats.c" do |s|
s.gsub! "CLOCK_MONOTONIC", "UNDEFINED_GIBBERISH"
s.gsub! "CLOCK_PROCESS_CPUTIME_ID", "UNDEFINED_GIBBERISH"

2
Formula/cmocka.rb
View file

@ -17,7 +17,7 @@ class Cmocka < Formula
def install
args = std_cmake_args
args << "-DWITH_STATIC_LIB=ON" << "-DWITH_CMOCKERY_SUPPORT=ON" << "-DUNIT_TESTING=ON"
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
args << "-DHAVE_CLOCK_GETTIME:INTERNAL=0"
end

2
Formula/erlang@18.rb
View file

@ -48,7 +48,7 @@ class ErlangAT18 < Formula
def install
# Fixes "dyld: Symbol not found: _clock_gettime"
# Reported 17 Sep 2016 https://bugs.erlang.org/browse/ERL-256
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
ENV["erl_cv_clock_gettime_monotonic_default_resolution"] = "no"
ENV["erl_cv_clock_gettime_monotonic_try_find_pthread_compatible"] = "no"
ENV["erl_cv_clock_gettime_wall_default_resolution"] = "no"

2
Formula/ffmpeg@2.8.rb
View file

@ -38,7 +38,7 @@ class FfmpegAT28 < Formula
def install
# Fixes "dyld: lazy symbol binding failed: Symbol not found: _clock_gettime"
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
inreplace %w[libavdevice/v4l2.c libavutil/time.c], "HAVE_CLOCK_GETTIME",
"UNDEFINED_GIBBERISH"
end

2
Formula/gnu-smalltalk.rb
View file

@ -26,7 +26,7 @@ class GnuSmalltalk < Formula
def install
# Fix build failure "Symbol not found: _clock_gettime"
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
ENV["ac_cv_search_clock_gettime"] = "no"
end

2
Formula/gtk-gnutella.rb
View file

@ -18,7 +18,7 @@ class GtkGnutella < Formula
def install
ENV.deparallelize
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "Configure", "ret = clock_gettime(CLOCK_REALTIME, &tp);",
"ret = undefinedgibberish(CLOCK_REALTIME, &tp);"
end

2
Formula/libcddb.rb
View file

@ -17,7 +17,7 @@ class Libcddb < Formula
depends_on "libcdio"
def install
if MacOS.version == :yosemite && MacOS::Xcode.installed? && MacOS::Xcode.version >= "7.0"
if MacOS.version == :yosemite && MacOS::Xcode.version >= "7.0"
ENV.delete("SDKROOT")
end

2
Formula/masscan.rb
View file

@ -16,7 +16,7 @@ class Masscan < Formula
def install
# Fix `dyld: lazy symbol binding failed: Symbol not found: _clock_gettime`
# Reported 8 July 2017: https://github.com/robertdavidgraham/masscan/issues/284
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "src/pixie-timer.c", "#elif defined(CLOCK_MONOTONIC)", "#elif defined(NOT_A_MACRO)"
end

2
Formula/mesos.rb
View file

@ -79,7 +79,7 @@ class Mesos < Formula
ENV.O0 unless DevelopmentTools.clang_build_version >= 900
# work around to avoid `_clock_gettime` symbol not found error.
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
ENV["ac_have_clock_syscall"] = "no"
end

2
Formula/mysql-cluster.rb
View file

@ -33,7 +33,7 @@ class MysqlCluster < Formula
(var/"mysql-cluster").mkpath
# dyld: lazy symbol binding failed: Symbol not found: _clock_gettime
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
inreplace "configure.cmake", "(clock_gettime", "(everything_is_terrible"
end

2
Formula/pigz.rb
View file

@ -15,7 +15,7 @@ class Pigz < Formula
def install
# Fix dyld: lazy symbol binding failed: Symbol not found: _deflatePending
# Reported 8 Dec 2016 to madler at alumni.caltech.edu
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "pigz.c", "ZLIB_VERNUM >= 0x1260", "ZLIB_VERNUM >= 0x9999"
end

2
Formula/pypy3.rb
View file

@ -59,7 +59,7 @@ class Pypy3 < Formula
def install
# Work around "dyld: Symbol not found: _utimensat"
if MacOS.version == :sierra && MacOS::Xcode.installed? && MacOS::Xcode.version >= "9.0"
if MacOS.version == :sierra && MacOS::Xcode.version >= "9.0"
ENV.delete("SDKROOT")
end

2
Formula/rtags.rb
View file

@ -23,7 +23,7 @@ class Rtags < Formula
args = std_cmake_args << "-DRTAGS_NO_BUILD_CLANG=ON"
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
args << "-DHAVE_CLOCK_MONOTONIC_RAW:INTERNAL=0"
args << "-DHAVE_CLOCK_MONOTONIC:INTERNAL=0"
end

2
Formula/spdylay.rb
View file

@ -23,7 +23,7 @@ class Spdylay < Formula
depends_on "openssl"
def install
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
ENV["ac_cv_search_clock_gettime"] = "no"
end

2
Formula/tarsnap.rb
View file

@ -23,7 +23,7 @@ class Tarsnap < Formula
def install
# dyld: lazy symbol binding failed: Symbol not found: _clock_gettime
# Reported 20 Aug 2017 https://github.com/Tarsnap/tarsnap/issues/286
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "libcperciva/util/monoclock.c", "CLOCK_MONOTONIC",
"UNDEFINED_GIBBERISH"
end

3
Formula/xdotool.rb
View file

@ -20,8 +20,7 @@ class Xdotool < Formula
def install
# Work around an issue with Xcode 8 on El Capitan, which
# errors out with `typedef redefinition with different types`
if MacOS.version == :el_capitan && MacOS::Xcode.installed? &&
MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
ENV.delete("SDKROOT")
end

2
Formula/zabbix.rb
View file

@ -32,7 +32,7 @@ class Zabbix < Formula
--with-openssl=#{Formula["openssl"].opt_prefix}
]
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
inreplace "configure", "clock_gettime(CLOCK_REALTIME, &tp);",
"undefinedgibberish(CLOCK_REALTIME, &tp);"
end

2
Formula/zorba.rb
View file

@ -29,7 +29,7 @@ class Zorba < Formula
# dyld: lazy symbol binding failed: Symbol not found: _clock_gettime
# usual superenv fix doesn't work since zorba doesn't use HAVE_CLOCK_GETTIME
if MacOS.version == :el_capitan && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0"
args << "-DZORBA_HAVE_CLOCKGETTIME=OFF"
end