@@ -1416,8 +1416,8 @@ function build_jll_package(src_name::String,
1416
1416
! ispath (pkg_dir) && mkdir (pkg_dir)
1417
1417
write (joinpath (pkg_dir, " platform_augmentation.jl" ), augment_platform_block)
1418
1418
1419
- overload_parse = """
1420
- # Update Base.parse for Julia <1.12 to support riscv64
1419
+ overload_parse = raw """
1420
+ # Update Base.parse to support riscv64, needed for Julia <1.12
1421
1421
@static if !haskey(BinaryPlatforms.arch_mapping, "riscv64")
1422
1422
1423
1423
function bbparse(::Type{Platform}, triplet::AbstractString; validate_strict::Bool = false)
@@ -1433,7 +1433,7 @@ function build_jll_package(src_name::String,
1433
1433
1434
1434
# Helper function to collapse dictionary of mappings down into a regex of
1435
1435
# named capture groups joined by "|" operators
1436
- c(mapping) = string("(",join(["(?<\ $ k>\ $ v)" for (k, v) in mapping], "|"), ")")
1436
+ c(mapping) = string("(",join(["(?<$k>$v)" for (k, v) in mapping], "|"), ")")
1437
1437
1438
1438
# We're going to build a mondo regex here to parse everything:
1439
1439
triplet_regex = Regex(string(
@@ -1448,8 +1448,8 @@ function build_jll_package(src_name::String,
1448
1448
c(cxxstring_abi_mapping),
1449
1449
c(libstdcxx_version_mapping),
1450
1450
# Finally, the catch-all for extended tags
1451
- "(?<tags>(?:-[^-]+\\\\ +[^-]+)*)?",
1452
- "\\\ $ ",
1451
+ "(?<tags>(?:-[^-]+\\ +[^-]+)*)?",
1452
+ "\$ ",
1453
1453
))
1454
1454
1455
1455
m = match(triplet_regex, triplet)
@@ -1502,10 +1502,13 @@ function build_jll_package(src_name::String,
1502
1502
end
1503
1503
os_version = nothing
1504
1504
if os == "macos"
1505
- os_version = extract_os_version("macos", r".*darwin([\\ d \\ .]+)")
1505
+ os_version = extract_os_version("macos", r".*darwin([\d .]+)"sa )
1506
1506
end
1507
1507
if os == "freebsd"
1508
- os_version = extract_os_version("freebsd", r".*freebsd([\\ d.]+)")
1508
+ os_version = extract_os_version("freebsd", r".*freebsd([\d .]+)"sa)
1509
+ end
1510
+ if os == "openbsd"
1511
+ os_version = extract_os_version("openbsd", r".*openbsd([\d .]+)"sa)
1509
1512
end
1510
1513
1511
1514
return Platform(
0 commit comments