Merge pull request #8122 from MikeMcQuaid/big_sur_fixes

Big Sur fixes

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:
+          Your #{source} does not support macOS #{MacOS.version}.
-              #{locator.all_sdks.map(&:version).join("\n  ")}
+          It is either outdated or was modified.
-          EOS
+          Please update your #{source} or delete it if no updates are available.
-        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.
         EOS
       end
     end

Library/Homebrew/os/mac/pkgconfig/10.16/expat.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/libcurl.pc

@@ -1,40 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) 2001 - 2018, Daniel Stenberg, <daniel@haxx.se>, 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:

Library/Homebrew/os/mac/pkgconfig/10.16/libedit.pc

@@ -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

Library/Homebrew/os/mac/pkgconfig/10.16/libexslt.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/libffi.pc

@@ -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}

Library/Homebrew/os/mac/pkgconfig/10.16/libxml-2.0.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/libxslt.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/ncurses.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/ncursesw.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/sqlite3.pc

@@ -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:

Library/Homebrew/os/mac/pkgconfig/10.16/uuid.pc

@@ -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}

Library/Homebrew/os/mac/pkgconfig/10.16/zlib.pc

@@ -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:

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",

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"