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

Merge pull request #4275 from DomT4/Mojave_DevTools_Updates

Browse Source 
10.14: recognise Xcode 10.0 & add pkg-config files.
This commit is contained in:
Mike McQuaid 2018-06-05 09:11:29 +01:00 committed by GitHub
commit 22e9fd7729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 112 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/development_tools.rb
View File

@ -63,7 +63,7 @@ class DevelopmentTools
def clang_version
@clang_version ||= begin
if (path = locate("clang")) &&
build_version = `#{path} --version`[/(?:clang|LLVM) version (\d\.\d)/, 1]
build_version = `#{path} --version`[/(?:clang|LLVM) version (\d+\.\d)/, 1]
Version.new build_version
else
Version::NULL

2
Library/Homebrew/os/mac.rb
View File

@ -211,6 +211,8 @@ module OS
"9.1" => { clang: "9.0", clang_build: 900 },
"9.2" => { clang: "9.0", clang_build: 900 },
"9.3" => { clang: "9.1", clang_build: 902 },
"9.4" => { clang: "9.1", clang_build: 902 },
"10.0" => { clang: "10.0", clang_build: 1000 },
}.freeze
def compilers_standard?

39
Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc Normal file
View File

@ -0,0 +1,39 @@
#***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
# / __| | | | |_) | |
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 2004 - 2012, 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 http://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.
#
prefix=/usr
exec_prefix=${prefix}
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 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.54.0
Libs: -L${libdir} -lcurl
Libs.private: -lldap -lz
Cflags: -I${includedir}

12
Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc Normal file
View File

@ -0,0 +1,12 @@
prefix=/usr
exec_prefix=${prefix}
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: -I${includedir}

13
Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc Normal file
View File

@ -0,0 +1,13 @@
prefix=/usr
exec_prefix=${prefix}
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: -I${includedir}/libxml2

12
Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc Normal file
View File

@ -0,0 +1,12 @@
prefix=/usr
exec_prefix=${prefix}
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: -I${includedir}

11
Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: SQLite
Description: SQL database engine
Version: 3.22.0
Libs: -L${libdir} -lsqlite3
Libs.private:
Cflags: -I${includedir}

13
Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc Normal file
View File

@ -0,0 +1,13 @@
prefix=/usr
exec_prefix=${prefix}
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: -I${includedir}

14
Library/Homebrew/os/mac/xcode.rb
View File

@ -18,17 +18,19 @@ module OS
when "10.10" then "7.2.1"
when "10.11" then "8.2.1"
when "10.12" then "9.2"
when "10.13" then "9.3"
when "10.13" then "9.4"
when "10.14" then "10.0"
else
raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease?
# Default to newest known version of Xcode for unreleased macOS versions.
"9.3"
"10.0"
end
end
def minimum_version
case MacOS.version
when "10.14" then "10.0"
when "10.13" then "9.0"
when "10.12" then "8.0"
else "2.0"
@ -170,8 +172,9 @@ module OS
when 80 then "8.0"
when 81 then "8.3"
when 90 then "9.2"
when 91 then "9.3"
else "9.3"
when 91 then "9.4"
when 100 then "10.0"
else "10.0"
end
end
@ -222,7 +225,8 @@ module OS
# on the older supported platform for that Xcode release, i.e there's no
# CLT package for 10.11 that contains the Clang version from Xcode 8.
case MacOS.version
when "10.13" then "902.0.39.1"
when "10.14" then "1000.10.25.5"
when "10.13" then "902.0.39.2"
when "10.12" then "900.0.39.2"
when "10.11" then "800.0.42.1"
when "10.10" then "700.1.81"