Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

folly, fizz, wangle: build on Mojave #77819

Closed
wants to merge 3 commits into from
Closed

folly, fizz, wangle: build on Mojave #77819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe327aa
folly: build on Mojave
carlocab May 22, 2021
4067e2e
fizz: build on Mojave
carlocab May 22, 2021
6f3e1de
wangle: build on Mojave
carlocab May 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Formula/fizz.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ class Fizz < Formula
depends_on "libevent"
depends_on "libsodium"
depends_on "lz4"
# https://github.com/facebook/folly/issues/1545
depends_on macos: :catalina
depends_on "openssl@1.1"
depends_on "snappy"
depends_on "zstd"
Expand Down
22 changes: 20 additions & 2 deletions Formula/folly.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,29 @@ class Folly < Formula
depends_on "glog"
depends_on "libevent"
depends_on "lz4"
# https://github.com/facebook/folly/issues/1545
depends_on macos: :catalina
depends_on "openssl@1.1"
depends_on "snappy"
depends_on "xz"
depends_on "zstd"

on_macos do
depends_on "llvm" if DevelopmentTools.clang_build_version <= 1100
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried to make this build-only, but that doesn't work.

end

fails_with :clang do
build 1100
# https://github.com/facebook/folly/issues/1545
cause <<-EOS
Undefined symbols for architecture x86_64:
"std::__1::__fs::filesystem::path::lexically_normal() const"
EOS
end

def install
on_macos do
ENV.llvm_clang if DevelopmentTools.clang_build_version <= 1100
Copy link
Member Author

@carlocab carlocab May 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also tried building with gcc, since that's the fallback for fails_with :clang, but that doesn't work since boost is built using clang.

end

mkdir "_build" do
args = std_cmake_args + %w[
-DFOLLY_USE_JEMALLOC=OFF
Expand All @@ -46,6 +61,9 @@ def install
end

test do
# Force use of Clang rather than LLVM Clang
on_macos { ENV.clang }

(testpath/"test.cc").write <<~EOS
#include <folly/FBVector.h>
int main() {
Expand Down
2 changes: 0 additions & 2 deletions Formula/wangle.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class Wangle < Formula
depends_on "libevent"
depends_on "libsodium"
depends_on "lz4"
# https://github.com/facebook/folly/issues/1545
depends_on macos: :catalina
depends_on "openssl@1.1"
depends_on "snappy"
depends_on "zstd"
Expand Down