From 194c48e9d291f126151f1c2dc1a7829b92d8184d Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Mon, 4 Jun 2018 21:23:27 +0100 Subject: [PATCH 1/5] xcode: add initial support for Xcode 10.0 --- Library/Homebrew/os/mac/xcode.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index f39273b42d..035c8a0355 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -19,16 +19,18 @@ module OS when "10.11" then "8.2.1" when "10.12" then "9.2" when "10.13" then "9.3" + 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" @@ -171,7 +173,8 @@ module OS when 81 then "8.3" when 90 then "9.2" when 91 then "9.3" - else "9.3" + when 100 then "10.0" + else "10.0" end end @@ -222,6 +225,7 @@ 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.14" then "1000.10.25.5" when "10.13" then "902.0.39.1" when "10.12" then "900.0.39.2" when "10.11" then "800.0.42.1" From b092f1d0a979ac5259242c0791537e3e5b30dc19 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Mon, 4 Jun 2018 22:54:39 +0100 Subject: [PATCH 2/5] pkg-config: add initial files for 10.14 --- .../os/mac/pkgconfig/10.14/libcurl.pc | 39 +++++++++++++++++++ .../os/mac/pkgconfig/10.14/libexslt.pc | 12 ++++++ .../os/mac/pkgconfig/10.14/libxml-2.0.pc | 13 +++++++ .../os/mac/pkgconfig/10.14/libxslt.pc | 12 ++++++ .../os/mac/pkgconfig/10.14/sqlite3.pc | 11 ++++++ .../Homebrew/os/mac/pkgconfig/10.14/zlib.pc | 13 +++++++ 6 files changed, 100 insertions(+) create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc new file mode 100644 index 0000000000..ff7a29ee24 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2012, Daniel Stenberg, , 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} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc new file mode 100644 index 0000000000..16276f7156 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libexslt.pc @@ -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} 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 new file mode 100644 index 0000000000..c297c6b454 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libxml-2.0.pc @@ -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 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc new file mode 100644 index 0000000000..92d07a988c --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/libxslt.pc @@ -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} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc new file mode 100644 index 0000000000..3d0d0a39b6 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/sqlite3.pc @@ -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} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc new file mode 100644 index 0000000000..837bb70ac3 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.14/zlib.pc @@ -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} From d1bd3fcf0386886e8d1ef57f78664c550a7c4a49 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 5 Jun 2018 05:28:37 +0100 Subject: [PATCH 3/5] development_tools: update regex --- Library/Homebrew/development_tools.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb index 1f0d77d148..2ee5169476 100644 --- a/Library/Homebrew/development_tools.rb +++ b/Library/Homebrew/development_tools.rb @@ -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 From 595c23286663009086509d9bdfbfa9b172d43fe5 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 5 Jun 2018 06:46:32 +0100 Subject: [PATCH 4/5] xcode: recognise/expect Xcode 9.4 on 10.13 --- Library/Homebrew/os/mac/xcode.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 035c8a0355..c8a1c40440 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -18,7 +18,7 @@ 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? @@ -172,7 +172,7 @@ module OS when 80 then "8.0" when 81 then "8.3" when 90 then "9.2" - when 91 then "9.3" + when 91 then "9.4" when 100 then "10.0" else "10.0" end @@ -226,7 +226,7 @@ module OS # CLT package for 10.11 that contains the Clang version from Xcode 8. case MacOS.version when "10.14" then "1000.10.25.5" - when "10.13" then "902.0.39.1" + 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" From 9640ef0540f22f62d12e401ae9d164fe44309e83 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 5 Jun 2018 06:48:26 +0100 Subject: [PATCH 5/5] mac: add 9.4 & 10.0 compilers --- Library/Homebrew/os/mac.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 3088dbf265..0e862cffb5 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -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?