Merge pull request #10129 from carlocab/big-sur-pkg-config

os/mac/pkgconfig: merge pc files for 11.1 and 11.0

Library/Homebrew/extend/os/mac/extend/ENV/std.rb

@@ -7,7 +7,7 @@ module Stdenv
   undef homebrew_extra_pkg_config_paths
 
   def homebrew_extra_pkg_config_paths
-    ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.sdk_version}"]
+    ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"]
   end
 
   def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false)

Library/Homebrew/extend/os/mac/extend/ENV/super.rb

@@ -34,7 +34,7 @@ module Superenv
   # @private
   def homebrew_extra_pkg_config_paths
     paths = \
-      ["/usr/lib/pkgconfig", "#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.sdk_version}"]
+      ["/usr/lib/pkgconfig", "#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"]
     paths << "#{MacOS::XQuartz.lib}/pkgconfig" << "#{MacOS::XQuartz.share}/pkgconfig" if x11?
     paths
   end

Library/Homebrew/os/mac/pkgconfig/11.0

@@ -0,0 +1 @@
+11

Library/Homebrew/os/mac/pkgconfig/11.0/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/MacOSX11.0.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/11.0/libedit.pc

@@ -1,12 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/libexslt.pc

@@ -1,13 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/libxml-2.0.pc

@@ -1,14 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/libxslt.pc

@@ -1,13 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/ncurses.pc

@@ -1,14 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/ncursesw.pc

@@ -1,14 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.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/11.0/sqlite3.pc

@@ -1,12 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
-prefix=${homebrew_sdkroot}/usr
-exec_prefix=/usr
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: SQLite
-Description: SQL database engine
-Version: 3.32.3
-Libs: -L${libdir} -lsqlite3
-Libs.private:
-Cflags:

Library/Homebrew/os/mac/pkgconfig/11.1

@@ -0,0 +1 @@
+11

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

@@ -1,12 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.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/11.1/libffi.pc

@@ -1,12 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.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/11.1/uuid.pc

@@ -1,14 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.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/11.1/zlib.pc

@@ -1,14 +0,0 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.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/pkgconfig/11/expat.pc

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -23,7 +23,7 @@
 # This should most probably benefit from getting a "Requires:" field added
 # dynamically by configure.
 #
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

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

@@ -1,4 +1,4 @@
-homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
+homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 prefix=${homebrew_sdkroot}/usr
 exec_prefix=/usr
 libdir=${exec_prefix}/lib

Library/Homebrew/test/os/mac/pkgconfig_spec.rb

@@ -15,7 +15,7 @@
 # For indeterminable cases, consult https://opensource.apple.com for the version used.
 describe "pkg-config" do
   def pc_version(library)
-    path = HOMEBREW_LIBRARY_PATH/"os/mac/pkgconfig/#{MacOS.sdk_version}/#{library}.pc"
+    path = HOMEBREW_LIBRARY_PATH/"os/mac/pkgconfig/#{MacOS.version}/#{library}.pc"
     version = File.foreach(path)
                   .lazy
                   .grep(/^Version:\s*?(.+)$/) { Regexp.last_match(1) }