Skip to content

Commit 7b4ef99

Browse files
Bo98Bo98
authored
Merge pull request #20062 from Homebrew/macos-26
Preliminary macOS 26 (Tahoe) support
2 parents ecd0d99 + b8e2cdd commit 7b4ef99

File tree

19 files changed

+255
-21
lines changed

19 files changed

+255
-21
lines changed

‎Library/Homebrew/macos_version.rb‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def initialize(version)
1919
# NOTE: When removing symbols here, ensure that they are added
2020
# to `DEPRECATED_MACOS_VERSIONS` in `MacOSRequirement`.
2121
SYMBOLS = {
22+
tahoe: "26",
2223
sequoia: "15",
2324
sonoma: "14",
2425
ventura: "13",
@@ -34,7 +35,9 @@ def initialize(version)
3435
sig { params(macos_version: MacOSVersion).returns(Version) }
3536
def self.kernel_major_version(macos_version)
3637
version_major = macos_version.major.to_i
37-
if version_major > 10
38+
if version_major >= 26
39+
Version.new((version_major - 1).to_s)
40+
elsif version_major > 10
3841
Version.new((version_major + 9).to_s)
3942
else
4043
version_minor = macos_version.minor.to_i
@@ -50,7 +53,7 @@ def self.from_symbol(version)
5053

5154
sig { params(version: T.nilable(String)).void }
5255
def initialize(version)
53-
raise MacOSVersion::Error, version unless /\A1\d+(?:\.\d+){0,2}\Z/.match?(version)
56+
raise MacOSVersion::Error, version unless /\A\d{2,}(?:\.\d+){0,2}\z/.match?(version)
5457

5558
super(T.must(version))
5659

‎Library/Homebrew/os/mac/pkgconfig/26/bzip2.pc‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
bindir=${exec_prefix}/bin
5+
libdir=${exec_prefix}/lib
6+
includedir=${prefix}/include
7+
8+
Name: bzip2
9+
Description: Lossless, block-sorting data compression
10+
Version: 1.0.8
11+
Libs: -L${libdir} -lbz2
12+
Cflags:

‎Library/Homebrew/os/mac/pkgconfig/26/expat.pc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
7+
Name: expat
8+
Version: 2.7.1
9+
Description: expat XML parser
10+
URL: https://libexpat.github.io/
11+
Libs: -L${libdir} -lexpat
12+
Libs.private:
13+
Cflags:
14+
Cflags.private: -DXML_STATIC

‎Library/Homebrew/os/mac/pkgconfig/26/libcurl.pc‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#***************************************************************************
2+
# _ _ ____ _
3+
# Project ___| | | | _ \| |
4+
# / __| | | | |_) | |
5+
# | (__| |_| | _ <| |___
6+
# \___|\___/|_| \_\_____|
7+
#
8+
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
9+
#
10+
# This software is licensed as described in the file COPYING, which
11+
# you should have received as part of this distribution. The terms
12+
# are also available at https://curl.se/docs/copyright.html.
13+
#
14+
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
15+
# copies of the Software, and permit persons to whom the Software is
16+
# furnished to do so, under the terms of the COPYING file.
17+
#
18+
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19+
# KIND, either express or implied.
20+
#
21+
# SPDX-License-Identifier: curl
22+
#
23+
###########################################################################
24+
25+
# This should most probably benefit from getting a "Requires:" field added
26+
# dynamically by configure.
27+
#
28+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
29+
prefix=${homebrew_sdkroot}/usr
30+
exec_prefix=/usr
31+
libdir=${exec_prefix}/lib
32+
includedir=${prefix}/include
33+
supported_protocols="DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS IPFS IPNS LDAP LDAPS MQTT POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP"
34+
supported_features="alt-svc AsynchDNS GSS-API HSTS HTTP2 HTTPS-proxy IPv6 Kerberos Largefile libz MultiSSL NTLM SPNEGO SSL threadsafe UnixSockets"
35+
36+
Name: libcurl
37+
URL: https://curl.se/
38+
Description: Library to transfer files with ftp, http, etc.
39+
Version: 8.7.1
40+
Libs: -L${libdir} -lcurl
41+
Libs.private: -lldap -lz
42+
Cflags:

‎Library/Homebrew/os/mac/pkgconfig/26/libedit.pc‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
7+
Name: libedit
8+
Description: command line editor library provides generic line editing, history, and tokenization functions.
9+
Version: 3.0
10+
Requires:
11+
Libs: -L${libdir} -ledit
12+
Cflags: -I${includedir}/editline

‎Library/Homebrew/os/mac/pkgconfig/26/libexslt.pc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
7+
8+
Name: libexslt
9+
Version: 0.8.20
10+
Description: EXSLT Extension library
11+
Requires: libxml-2.0, libxslt
12+
Cflags:
13+
Libs: -L${libdir} -lexslt
14+
Libs.private:

‎Library/Homebrew/os/mac/pkgconfig/26/libffi.pc‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
toolexeclibdir=${libdir}
6+
includedir=${prefix}/include/ffi
7+
8+
Name: libffi
9+
Description: Library supporting Foreign Function Interfaces
10+
Version: 3.4-rc1
11+
Libs: -L${toolexeclibdir} -lffi
12+
Cflags: -I${includedir}

‎Library/Homebrew/os/mac/pkgconfig/26/libxml-2.0.pc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
modules=1
7+
8+
Name: libXML
9+
Version: 2.9.13
10+
Description: libXML library version2.
11+
Requires:
12+
Libs: -L${libdir} -lxml2
13+
Libs.private: -lz -lpthread -licucore -lm
14+
Cflags:

‎Library/Homebrew/os/mac/pkgconfig/26/libxslt.pc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
7+
8+
Name: libxslt
9+
Version: 1.1.35
10+
Description: XSLT library version 2.
11+
Requires: libxml-2.0
12+
Cflags:
13+
Libs: -L${libdir} -lxslt
14+
Libs.private:

‎Library/Homebrew/os/mac/pkgconfig/26/ncurses.pc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
homebrew_sdkroot=/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk
2+
prefix=${homebrew_sdkroot}/usr
3+
exec_prefix=/usr
4+
libdir=${exec_prefix}/lib
5+
includedir=${prefix}/include
6+
abi_version=5.4
7+
major_version=6
8+
version=6.0.20150808
9+
10+
Name: ncurses
11+
Description: ncurses 6.0 library
12+
Version: ${version}
13+
URL: http://invisible-island.net/ncurses
14+
Requires.private:
15+
Libs: -L${libdir} -lncurses
16+
Libs.private:
17+
Cflags: -D_DARWIN_C_SOURCE

0 commit comments

Comments
 (0)