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

os/mac/pkgconfig: merge pc files for 11.1 and 11.0
Homebrew · Dec 28, 2020 · e74be0f · e74be0f
2 parents 8fa6970 + d7323f3
commit e74be0f
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 199 deletions.
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/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)

diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -34,7 +34,7 @@ def homebrew_extra_paths
   # @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

diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0 b/Library/Homebrew/os/mac/pkgconfig/11.0
@@ -0,0 +1 @@
+11
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/libcurl.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/libedit.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/libedit.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/libexslt.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/libxml-2.0.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/libxslt.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/ncurses.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/ncurses.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/ncursesw.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/ncursesw.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.0/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/11.0/sqlite3.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.1 b/Library/Homebrew/os/mac/pkgconfig/11.1
@@ -0,0 +1 @@
+11
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.1/expat.pc b/Library/Homebrew/os/mac/pkgconfig/11.1/expat.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.1/libffi.pc b/Library/Homebrew/os/mac/pkgconfig/11.1/libffi.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.1/uuid.pc b/Library/Homebrew/os/mac/pkgconfig/11.1/uuid.pc
diff --git a/Library/Homebrew/os/mac/pkgconfig/11.1/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/11.1/zlib.pc
diff --git a/...y/Homebrew/os/mac/pkgconfig/11.0/expat.pc → ...ary/Homebrew/os/mac/pkgconfig/11/expat.pc b/...y/Homebrew/os/mac/pkgconfig/11.0/expat.pc → ...ary/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

diff --git a/...Homebrew/os/mac/pkgconfig/11.1/libcurl.pc → ...y/Homebrew/os/mac/pkgconfig/11/libcurl.pc b/...Homebrew/os/mac/pkgconfig/11.1/libcurl.pc → ...y/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

diff --git a/...Homebrew/os/mac/pkgconfig/11.1/libedit.pc → ...y/Homebrew/os/mac/pkgconfig/11/libedit.pc b/...Homebrew/os/mac/pkgconfig/11.1/libedit.pc → ...y/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

diff --git a/...omebrew/os/mac/pkgconfig/11.1/libexslt.pc → .../Homebrew/os/mac/pkgconfig/11/libexslt.pc b/...omebrew/os/mac/pkgconfig/11.1/libexslt.pc → .../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

diff --git a/.../Homebrew/os/mac/pkgconfig/11.0/libffi.pc → ...ry/Homebrew/os/mac/pkgconfig/11/libffi.pc b/.../Homebrew/os/mac/pkgconfig/11.0/libffi.pc → ...ry/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

diff --git a/...ebrew/os/mac/pkgconfig/11.1/libxml-2.0.pc → ...omebrew/os/mac/pkgconfig/11/libxml-2.0.pc b/...ebrew/os/mac/pkgconfig/11.1/libxml-2.0.pc → ...omebrew/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

diff --git a/...Homebrew/os/mac/pkgconfig/11.1/libxslt.pc → ...y/Homebrew/os/mac/pkgconfig/11/libxslt.pc b/...Homebrew/os/mac/pkgconfig/11.1/libxslt.pc → ...y/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

diff --git a/...Homebrew/os/mac/pkgconfig/11.1/ncurses.pc → ...y/Homebrew/os/mac/pkgconfig/11/ncurses.pc b/...Homebrew/os/mac/pkgconfig/11.1/ncurses.pc → ...y/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

diff --git a/...omebrew/os/mac/pkgconfig/11.1/ncursesw.pc → .../Homebrew/os/mac/pkgconfig/11/ncursesw.pc b/...omebrew/os/mac/pkgconfig/11.1/ncursesw.pc → .../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

diff --git a/...Homebrew/os/mac/pkgconfig/11.1/sqlite3.pc → ...y/Homebrew/os/mac/pkgconfig/11/sqlite3.pc b/...Homebrew/os/mac/pkgconfig/11.1/sqlite3.pc → ...y/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

diff --git a/...ry/Homebrew/os/mac/pkgconfig/11.0/uuid.pc → Library/Homebrew/os/mac/pkgconfig/11/uuid.pc b/...ry/Homebrew/os/mac/pkgconfig/11.0/uuid.pc → 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

diff --git a/...ry/Homebrew/os/mac/pkgconfig/11.0/zlib.pc → Library/Homebrew/os/mac/pkgconfig/11/zlib.pc b/...ry/Homebrew/os/mac/pkgconfig/11.0/zlib.pc → 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

diff --git a/Library/Homebrew/test/os/mac/pkgconfig_spec.rb b/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) }