Skip to content

Commit 6ba66e1

Browse files
authored
Merge pull request #220023 from Homebrew/cryfs-runtime-cpu
cryfs: enable runtime CPU detection for bundled cryptopp
2 parents 1919a35 + 353838c commit 6ba66e1

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Formula/c/cryfs.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,23 @@ class Cryfs < Formula
1414
end
1515

1616
depends_on "cmake" => :build
17+
depends_on "curl" => :build
1718
depends_on "pkgconf" => :build
1819
depends_on "[email protected]" => :build
20+
depends_on "range-v3" => :build
1921
depends_on "boost"
20-
depends_on "curl"
2122
depends_on "fmt"
2223
depends_on "libfuse@2" # FUSE 3 issue: https://github.com/cryfs/cryfs/issues/419
2324
depends_on :linux # on macOS, requires closed-source macFUSE
24-
depends_on "range-v3"
2525
depends_on "spdlog"
2626

2727
# Update for changes in Boost.Process 1.88.0+.
28-
# TODO: Handle this upstream
28+
# PR ref: https://github.com/cryfs/cryfs/pull/494
2929
patch :DATA
3030

3131
def install
32-
system "cmake", "-B", "build", "-S", ".",
33-
"-DCRYFS_UPDATE_CHECKS=OFF",
34-
"-DDEPENDENCY_CONFIG=cmake-utils/DependenciesFromLocalSystem.cmake",
35-
*std_cmake_args
32+
ENV.runtime_cpu_detection # for bundled cryptopp
33+
system "cmake", "-B", "build", "-S", ".", "-DCRYFS_UPDATE_CHECKS=OFF", *std_cmake_args
3634
system "cmake", "--build", "build"
3735
system "cmake", "--install", "build"
3836
end

style_exceptions/runtime_cpu_detection_allowlist.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"blis",
88
"botan",
99
"coreutils",
10+
"cryfs",
1011
"cryptopp",
1112
"fftw",
1213
"fio",

0 commit comments

Comments
 (0)