admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

shims/mac/super/pkg-config: pass and use HOMEBREW_SDKROOT

Browse Source 
Fixes #5068.
This commit is contained in:
Bo Anderson 2020-04-04 15:38:55 +01:00
parent 28a1497c2b
commit 9294bee866
16 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/extend/ENV/super.rb
View File

@ -112,6 +112,8 @@ module Superenv
end end
generic_setup_build_environment(formula) 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 # Filter out symbols known not to be defined since GNU Autotools can't
# reliably figure this out with Xcode 8 and above. # reliably figure this out with Xcode 8 and above.
if MacOS.version == "10.12" && MacOS::Xcode.version >= "9.0" if MacOS.version == "10.12" && MacOS::Xcode.version >= "9.0"

4
Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc
View File

@ -23,8 +23,8 @@
# This should most probably benefit from getting a "Requires:" field added # This should most probably benefit from getting a "Requires:" field added
# dynamically by configure. # dynamically by configure.
# #
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include 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_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP"

4
Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include
modules=1 modules=1

4
Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.14/uuid.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
sharedlibdir=${libdir} sharedlibdir=${libdir}
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
sharedlibdir=${libdir} sharedlibdir=${libdir}
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.15/libcurl.pc
View File

@ -23,8 +23,8 @@
# This should most probably benefit from getting a "Requires:" field added # This should most probably benefit from getting a "Requires:" field added
# dynamically by configure. # dynamically by configure.
# #
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include 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_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP"

4
Library/Homebrew/os/mac/pkgconfig/10.15/libexslt.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.15/libxml-2.0.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include
modules=1 modules=1

4
Library/Homebrew/os/mac/pkgconfig/10.15/libxslt.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.15/sqlite3.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.15/uuid.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
sharedlibdir=${libdir} sharedlibdir=${libdir}
includedir=${prefix}/include includedir=${prefix}/include

4
Library/Homebrew/os/mac/pkgconfig/10.15/zlib.pc
View File

@ -1,5 +1,5 @@
prefix=/usr prefix=${homebrew_sdkroot}/usr
exec_prefix=${prefix} exec_prefix=/usr
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
sharedlibdir=${libdir} sharedlibdir=${libdir}
includedir=${prefix}/include includedir=${prefix}/include

5
Library/Homebrew/shims/mac/super/pkg-config Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
exec "$HOMEBREW_OPT/pkg-config/bin/pkg-config" \
"--define-variable=homebrew_sdkroot=$HOMEBREW_SDKROOT" \
"$@"