diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index a3498e0e2b..5b017b19ce 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -372,19 +372,10 @@ module Homebrew "Xcode" end - all_sdks = locator.all_sdks - sdks_found_msg = unless all_sdks.empty? - <<~EOS - Homebrew found the following SDKs in the #{source} install: - #{locator.all_sdks.map(&:version).join("\n ")} - EOS - end - <<~EOS - Could not find an SDK that supports macOS #{MacOS.version}. - You may have have an outdated or incompatible #{source}. - #{sdks_found_msg} - Please update #{source} or uninstall it if no updates are available. + Your #{source} does not support macOS #{MacOS.version}. + It is either outdated or was modified. + Please update your #{source} or delete it if no updates are available. EOS end end diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/expat.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/expat.pc deleted file mode 100644 index 7f611de4f3..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/expat.pc +++ /dev/null @@ -1,12 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: expat -Version: 2.2.8 -Description: expat XML parser -URL: http://www.libexpat.org -Libs: -L${libdir} -lexpat -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libcurl.pc deleted file mode 100644 index 5355350d97..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libcurl.pc +++ /dev/null @@ -1,40 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2001 - 2018, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at https://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" -supported_features="AsynchDNS IPv6 Largefile GSS-API Kerberos SPNEGO MultiSSL NTLM NTLM_WB SSL libz HTTP2 UnixSockets HTTPS-proxy" - -Name: libcurl -URL: https://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.64.1 -Libs: -L${libdir} -lcurl -Libs.private: -lldap -lz -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libedit.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libedit.pc deleted file mode 100644 index dcf7ce187a..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libedit.pc +++ /dev/null @@ -1,12 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libedit -Description: command line editor library provides generic line editing, history, and tokenization functions. -Version: 3.0 -Requires: -Libs: -L${libdir} -ledit -Cflags: -I${includedir}/editline diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libexslt.pc deleted file mode 100644 index 9e28e8c76d..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libexslt.pc +++ /dev/null @@ -1,13 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.17 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libffi.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libffi.pc deleted file mode 100644 index 93bd99e9d2..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libffi.pc +++ /dev/null @@ -1,12 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -toolexeclibdir=${libdir} -includedir=${prefix}/include/ffi - -Name: libffi -Description: Library supporting Foreign Function Interfaces -Version: 3.3-rc0 -Libs: -L${toolexeclibdir} -lffi -Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libxml-2.0.pc deleted file mode 100644 index 7ed00b1f27..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libxml-2.0.pc +++ /dev/null @@ -1,14 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.9.4 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lz -lpthread -licucore -lm -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/libxslt.pc deleted file mode 100644 index 6d2458e3dd..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/libxslt.pc +++ /dev/null @@ -1,13 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.29 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/ncurses.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/ncurses.pc deleted file mode 100644 index 19df0804d6..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/ncurses.pc +++ /dev/null @@ -1,14 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include -major_version=5 -version=5.7.20081102 - -Name: ncurses -Description: ncurses 5.7 library -Version: ${version} -Requires: -Libs: -L${libdir} -lncurses -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/ncursesw.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/ncursesw.pc deleted file mode 100644 index 85000fda6b..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/ncursesw.pc +++ /dev/null @@ -1,14 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include -major_version=5 -version=5.7.20081102 - -Name: ncursesw -Description: ncurses 5.7 library -Version: ${version} -Requires: -Libs: -L${libdir} -lncurses -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/sqlite3.pc deleted file mode 100644 index ccb697388d..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/sqlite3.pc +++ /dev/null @@ -1,12 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.31.1 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/uuid.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/uuid.pc deleted file mode 100644 index f10358b624..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/uuid.pc +++ /dev/null @@ -1,14 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include/uuid - -Name: uuid -Description: Universally unique id library -Version: 1.0 - -Requires: -Libs: -Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.16/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.16/zlib.pc deleted file mode 100644 index 1be09ff9de..0000000000 --- a/Library/Homebrew/os/mac/pkgconfig/10.16/zlib.pc +++ /dev/null @@ -1,14 +0,0 @@ -homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX10.16.sdk -prefix=${homebrew_sdkroot}/usr -exec_prefix=/usr -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.11 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index f80c225744..2134637344 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -7,7 +7,7 @@ module OS module Mac class Version < ::Version SYMBOLS = { - big_sur: Hardware::CPU.arm? ? "11.0" : "10.16", + big_sur: "11.0", catalina: "10.15", mojave: "10.14", high_sierra: "10.13", diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 6190e267f4..5f1a23d663 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -15,7 +15,7 @@ module OS def latest_version latest_stable = "11.5" case MacOS.version - when "11.0", "10.16" then "12.0" + when "11.0" then "12.0" when "10.15" then latest_stable when "10.14" then "11.3.1" when "10.13" then "10.1" @@ -37,7 +37,7 @@ module OS # also in beta). def minimum_version case MacOS.version - when "11.0", "10.16" then "12.0" + when "11.0" then "12.0" when "10.15" then "11.0" when "10.14" then "10.2" when "10.13" then "9.0" @@ -257,7 +257,7 @@ module OS # and our CI systems have been updated. def latest_clang_version case MacOS.version - when "11.0", "10.16" then "1200.0.22.7" + when "11.0" then "1200.0.22.7" when "10.15" then "1103.0.32.59" when "10.14" then "1001.0.46.4" when "10.13" then "1000.10.44.2" @@ -273,7 +273,7 @@ module OS # that macOS version. def minimum_version case MacOS.version - when "11.0", "10.16" then "12.0.0" + when "11.0" then "12.0.0" when "10.15" then "11.0.0" when "10.14" then "10.0.0" when "10.13" then "9.0.0"