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.

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

boost: drop single threaded variant #182995

Closed
wants to merge 10 commits into from
4 changes: 2 additions & 2 deletions Formula/a/azure-storage-cpp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class AzureStorageCpp < Formula
url "https://github.com/Azure/azure-storage-cpp/archive/refs/tags/v7.5.0.tar.gz"
sha256 "446a821d115949f6511b7eb01e6a0e4f014b17bfeba0f3dc33a51750a9d5eca5"
license "Apache-2.0"
revision 10
revision 11

bottle do
sha256 cellar: :any, arm64_sonoma: "88c8ce8dd3036ecb8d825e45e4f540d3f85812a5551adbdff2f3e633a14971b2"
Expand Down Expand Up @@ -58,7 +58,7 @@ def install
"-L#{Formula["cpprestsdk"].lib}",
"-L#{Formula["openssl@3"].lib}",
"-L#{lib}",
"-lcpprest", "-lboost_system-mt", "-lssl", "-lcrypto", "-lazurestorage"]
"-lcpprest", "-lboost_system", "-lssl", "-lcrypto", "-lazurestorage"]
flags << "-stdlib=libc++" if OS.mac?
system ENV.cxx, "-o", "test_azurestoragecpp", "test.cpp", *flags
system "./test_azurestoragecpp"
Expand Down
10 changes: 4 additions & 6 deletions Formula/b/boost-mpi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class BoostMpi < Formula
url "https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.xz"
sha256 "a4d99d032ab74c9c5e76eddcecc4489134282245fffa7e079c5804b92b45f51d"
license "BSL-1.0"
revision 1
head "https://github.com/boostorg/boost.git", branch: "master"

livecheck do
Expand Down Expand Up @@ -31,10 +32,10 @@ def install
args = %W[
-d2
-j#{ENV.make_jobs}
--layout=tagged-1.66
--layout=system
--user-config=user-config.jam
install
threading=multi,single
threading=multi
link=shared,static
]

Expand Down Expand Up @@ -65,9 +66,6 @@ def install
if OS.mac?
# libboost_mpi links to libboost_serialization, which comes from the main boost formula
boost = Formula["boost"]
MachO::Tools.change_install_name("#{lib}/libboost_mpi-mt.dylib",
"libboost_serialization-mt.dylib",
"#{boost.lib}/libboost_serialization-mt.dylib")
MachO::Tools.change_install_name("#{lib}/libboost_mpi.dylib",
"libboost_serialization.dylib",
"#{boost.lib}/libboost_serialization.dylib")
Expand Down Expand Up @@ -106,7 +104,7 @@ def install
boost = Formula["boost"]
args = ["-L#{lib}",
"-L#{boost.lib}",
"-lboost_mpi-mt",
"-lboost_mpi",
"-lboost_serialization",
"-std=c++14"]

Expand Down
5 changes: 3 additions & 2 deletions Formula/b/boost-python3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class BoostPython3 < Formula
url "https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.xz"
sha256 "a4d99d032ab74c9c5e76eddcecc4489134282245fffa7e079c5804b92b45f51d"
license "BSL-1.0"
revision 1
head "https://github.com/boostorg/boost.git", branch: "master"

livecheck do
Expand Down Expand Up @@ -45,10 +46,10 @@ def install
args = %W[
-d2
-j#{ENV.make_jobs}
--layout=tagged-1.66
--layout=system
--user-config=user-config.jam
install
threading=multi,single
threading=multi
link=shared,static
]

Expand Down
18 changes: 14 additions & 4 deletions Formula/b/boost.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
class Boost < Formula
desc "Collection of portable C++ source libraries"
homepage "https://www.boost.org/"
url "https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.xz"
sha256 "a4d99d032ab74c9c5e76eddcecc4489134282245fffa7e079c5804b92b45f51d"
license "BSL-1.0"
revision 1
head "https://github.com/boostorg/boost.git", branch: "master"

stable do
url "https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.xz"
sha256 "a4d99d032ab74c9c5e76eddcecc4489134282245fffa7e079c5804b92b45f51d"

# Backport Boost.Compute support for latest Boost.Uuid
patch :p2 do
url "https://github.com/boostorg/compute/commit/79452d5279831ee59a650c17b71259a821f1a554.patch?full_index=1"
sha256 "ed4b9740c1f300ed0413498f0cba6f05389b570bec6a4b456d53314a2561d061"
end
end

livecheck do
url "https://www.boost.org/users/download/"
regex(/href=.*?boost[._-]v?(\d+(?:[._]\d+)+)\.t/i)
Expand Down Expand Up @@ -64,10 +74,10 @@ def install
--libdir=#{lib}
-d2
-j#{ENV.make_jobs}
--layout=tagged-1.66
--layout=system
--user-config=user-config.jam
install
threading=multi,single
threading=multi
link=shared,static
]

Expand Down
3 changes: 1 addition & 2 deletions Formula/c/c10t.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class C10t < Formula
url "https://github.com/udoprog/c10t/archive/refs/tags/1.7.tar.gz"
sha256 "0e5779d517105bfdd14944c849a395e1a8670bedba5bdab281a0165c3eb077dc"
license "BSD-3-Clause"
revision 9
revision 10

bottle do
sha256 cellar: :any, arm64_sonoma: "65c200e6b93a21b12be0194fa4115c56bf86a919e73a9b77a005db40bc5e00f2"
Expand Down Expand Up @@ -50,7 +50,6 @@ class C10t < Formula

def install
ENV.cxx11
inreplace "test/CMakeLists.txt", "boost_unit_test_framework", "boost_unit_test_framework-mt"

args = []
unless OS.mac?
Expand Down
5 changes: 3 additions & 2 deletions Formula/c/cpprestsdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class Cpprestsdk < Formula
tag: "v2.10.19",
revision: "411a109150b270f23c8c97fa4ec9a0a4a98cdecf"
license "MIT"
revision 1
head "https://github.com/Microsoft/cpprestsdk.git", branch: "development"

bottle do
Expand Down Expand Up @@ -44,8 +45,8 @@ def install
system ENV.cxx, "test.cc", "-std=c++11",
"-I#{Formula["boost"].include}", "-I#{Formula["openssl@3"].include}", "-I#{include}",
"-L#{Formula["boost"].lib}", "-L#{Formula["openssl@3"].lib}", "-L#{lib}",
"-lssl", "-lcrypto", "-lboost_random-mt", "-lboost_chrono-mt", "-lboost_thread-mt",
"-lboost_system-mt", "-lboost_filesystem-mt", "-lcpprest",
"-lssl", "-lcrypto", "-lboost_random", "-lboost_chrono", "-lboost_thread",
"-lboost_system", "-lboost_filesystem", "-lcpprest",
"-o", "test_cpprest"
assert_match "<title>Example Domain</title>", shell_output("./test_cpprest")
end
Expand Down
4 changes: 2 additions & 2 deletions Formula/e/edencommon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Edencommon < Formula
url "https://github.com/facebookexperimental/edencommon/archive/refs/tags/v2024.08.26.00.tar.gz"
sha256 "4a7b1e9c97617ad0c34524ec7ccb35a746deaf58f4b72ee84aeaf5c4632da94b"
license "MIT"
revision 1
head "https://github.com/facebookexperimental/edencommon.git", branch: "main"

bottle do
Expand Down Expand Up @@ -42,7 +43,6 @@ def install

shared_args = ["-DBUILD_SHARED_LIBS=ON", "-DCMAKE_INSTALL_RPATH=#{rpath}"]
linker_flags = %w[-undefined dynamic_lookup -dead_strip_dylibs]
linker_flags << "-ld_classic" if OS.mac? && MacOS.version == :ventura
shared_args << "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,#{linker_flags.join(",")}" if OS.mac?

system "cmake", "-S", ".", "-B", "_build", *shared_args, *std_cmake_args
Expand All @@ -69,7 +69,7 @@ def install
system ENV.cxx, "-std=c++17", "-I#{include}", "test.cc",
"-L#{lib}", "-L#{Formula["folly"].opt_lib}",
"-L#{Formula["boost"].opt_lib}", "-L#{Formula["glog"].opt_lib}", "-L#{Formula["fmt"].opt_lib}",
"-ledencommon_utils", "-lfolly", "-lfmt", "-lboost_context-mt", "-lglog", "-o", "test"
"-ledencommon_utils", "-lfolly", "-lfmt", "-lboost_context", "-lglog", "-o", "test"
assert_match "ruby", shell_output("./test #{Process.pid}")
end
end
1 change: 1 addition & 0 deletions Formula/f/fbthrift.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Fbthrift < Formula
url "https://github.com/facebook/fbthrift/archive/refs/tags/v2024.08.26.00.tar.gz"
sha256 "e763819b98d8e8b40ca49cdc0efdce49ea745cbd8828ca5df98d6bf217dee9d4"
license "Apache-2.0"
revision 1
head "https://github.com/facebook/fbthrift.git", branch: "main"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/f/folly.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Folly < Formula
url "https://github.com/facebook/folly/archive/refs/tags/v2024.08.26.00.tar.gz"
sha256 "7f08016988ca146c77ced2fafd2ae6b39159ab7f99e7eb0c3e8eeed8dc09c03d"
license "Apache-2.0"
revision 1
head "https://github.com/facebook/folly.git", branch: "main"

bottle do
Expand Down
4 changes: 1 addition & 3 deletions Formula/g/graph-tool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class GraphTool < Formula
url "https://downloads.skewed.de/graph-tool/graph-tool-2.77.tar.bz2"
sha256 "9aeffaaf5528f37e994f1b882f751db0abee533f87d45658f58dd96c404ad0b4"
license "LGPL-3.0-or-later"
revision 1
revision 2

livecheck do
url "https://downloads.skewed.de/graph-tool/"
Expand Down Expand Up @@ -138,9 +138,7 @@ def install
args = %W[
PYTHON=#{venv.root}/bin/python
--with-python-module-path=#{prefix/site_packages}
--with-boost-python=boost_python#{xy.to_s.delete(".")}-mt
--with-boost-libdir=#{Formula["boost"].opt_lib}
--with-boost-coroutine=boost_coroutine-mt
--disable-silent-rules
]
args << "PYTHON_LIBS=-undefined dynamic_lookup" if OS.mac?
Expand Down
Loading