diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index acbdd982fd..f786b70434 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -112,6 +112,8 @@ module Superenv end generic_setup_build_environment(formula) + self["PKG_CONFIG"] = Superenv.bin/"pkg-config" + # Filter out symbols known not to be defined since GNU Autotools can't # reliably figure this out with Xcode 8 and above. if MacOS.version == "10.12" && MacOS::Xcode.version >= "9.0" diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc index ff7a29ee24..9b38135629 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc @@ -23,8 +23,8 @@ # This should most probably benefit from getting a "Requires:" field added # dynamically by configure. # -prefix=/usr -exec_prefix=${prefix} +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" diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc index 16276f7156..38b191fc33 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc index c297c6b454..d0dc6b36ff 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include modules=1 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc index 92d07a988c..05536f408e 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc index d7eefa4b5c..167eb8446b 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/uuid.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/uuid.pc index f5c6851ebe..20b05cc51b 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/uuid.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/uuid.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc index 837bb70ac3..a18584595e 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/libcurl.pc index a7bbaa0478..b96817e7cb 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/libcurl.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/libcurl.pc @@ -23,8 +23,8 @@ # This should most probably benefit from getting a "Requires:" field added # dynamically by configure. # -prefix=/usr -exec_prefix=${prefix} +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" diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/libexslt.pc index 16276f7156..38b191fc33 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/libexslt.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/libexslt.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/libxml-2.0.pc index c297c6b454..d0dc6b36ff 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/libxml-2.0.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/libxml-2.0.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include modules=1 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/libxslt.pc index 92d07a988c..05536f408e 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/libxslt.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/libxslt.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/sqlite3.pc index 2e68dbac0b..11ef0fdb37 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/sqlite3.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/sqlite3.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/uuid.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/uuid.pc index f5c6851ebe..20b05cc51b 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/uuid.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/uuid.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include diff --git a/Library/Homebrew/os/mac/pkgconfig/10.15/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.15/zlib.pc index 837bb70ac3..a18584595e 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.15/zlib.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.15/zlib.pc @@ -1,5 +1,5 @@ -prefix=/usr -exec_prefix=${prefix} +prefix=${homebrew_sdkroot}/usr +exec_prefix=/usr libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include diff --git a/Library/Homebrew/shims/mac/super/pkg-config b/Library/Homebrew/shims/mac/super/pkg-config new file mode 100755 index 0000000000..ceb5b1b775 --- /dev/null +++ b/Library/Homebrew/shims/mac/super/pkg-config @@ -0,0 +1,5 @@ +#!/bin/sh + +exec "$HOMEBREW_OPT/pkg-config/bin/pkg-config" \ + "--define-variable=homebrew_sdkroot=$HOMEBREW_SDKROOT" \ + "$@"