Skip to content

Commit d42eeaa

Browse files
committed
ice 3.8.0
1 parent be581ba commit d42eeaa

File tree

1 file changed

+10
-48
lines changed

1 file changed

+10
-48
lines changed

Formula/i/ice.rb

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
class Ice < Formula
22
desc "Comprehensive RPC framework"
33
homepage "https://zeroc.com"
4-
url "https://github.com/zeroc-ice/ice/archive/refs/tags/v3.7.10.tar.gz"
5-
sha256 "b90e9015ca9124a9eadfdfc49c5fba24d3550c547f166f3c9b2b5914c00fb1df"
4+
url "https://github.com/zeroc-ice/ice/archive/refs/tags/v3.8.0.tar.gz"
5+
sha256 "ec03e18b1bb0e83547744f3d0d0b73b60e5b497bed10de6f933b54525802a3cb"
66
license "GPL-2.0-only"
77

88
livecheck do
99
url :stable
1010
strategy :github_latest
1111
end
1212

13-
no_autobump! because: :requires_manual_review
14-
1513
bottle do
1614
sha256 cellar: :any, arm64_tahoe: "163b12ea66fc9210f121ee9c2f0fc18404d8f660a963d3bf492af0b807eb19d8"
1715
sha256 cellar: :any, arm64_sequoia: "7c514dfb78c4739a0e3a89fef4c6cb238fa944b43efab26bda3aea20ec4ae47e"
@@ -38,22 +36,8 @@ class Ice < Formula
3836
end
3937

4038
def install
41-
extra_cxxflags = []
42-
43-
# Workaround for Xcode 16 (LLVM 17) Clang bug that causes:
44-
# include/Ice/OutgoingAsync.h: error: declaration shadows a local variable [-Werror,-Wshadow-uncaptured-local]
45-
# Ref: https://github.com/llvm/llvm-project/issues/81307
46-
# Ref: https://github.com/llvm/llvm-project/issues/71976
47-
extra_cxxflags << "-Wno-shadow-uncaptured-local" if DevelopmentTools.clang_build_version >= 1600
48-
49-
# Workaround for macOS 26 SDK
50-
extra_cxxflags << "-Wno-deprecated-declarations" if DevelopmentTools.clang_build_version >= 1700
51-
52-
# Workaround for Xcode 26 (Clang 17)
53-
extra_cxxflags << "-Wno-reserved-user-defined-literal" if DevelopmentTools.clang_build_version >= 1700
54-
55-
unless extra_cxxflags.empty?
56-
inreplace "config/Make.rules.Darwin", "-Wdocumentation ", "\\0#{extra_cxxflags.join(" ")} "
39+
if DevelopmentTools.clang_build_version < 1700
40+
inreplace "config/Make.rules.Darwin", "-Wl,-max_default_common_align,0x4000", ""
5741
end
5842

5943
args = [
@@ -62,33 +46,11 @@ def install
6246
"USR_DIR_INSTALL=yes", # ensure slice and man files are installed to share
6347
"MCPP_HOME=#{Formula["mcpp"].opt_prefix}",
6448
"LMDB_HOME=#{Formula["lmdb"].opt_prefix}",
65-
"CONFIGS=shared cpp11-shared xcodesdk cpp11-xcodesdk",
49+
"CONFIGS=all",
6650
"PLATFORMS=all",
67-
"SKIP=slice2confluence",
6851
"LANGUAGES=cpp",
6952
]
70-
71-
# Fails with Xcode < 12.5
72-
inreplace "cpp/include/Ice/Object.h", /^#.+"-Wdeprecated-copy-dtor"+/, "" if OS.mac? && MacOS.version <= :catalina
73-
7453
system "make", "install", *args
75-
76-
# We install these binaries to libexec because they conflict with those
77-
# installed along with the ice packages from PyPI, RubyGems and npm.
78-
(libexec/"bin").mkpath
79-
%w[slice2py slice2rb slice2js].each do |r|
80-
mv bin/r, libexec/"bin"
81-
end
82-
end
83-
84-
def caveats
85-
<<~EOS
86-
slice2py, slice2js and slice2rb were installed in:
87-
88-
#{opt_libexec}/bin
89-
90-
You may wish to add this directory to your PATH.
91-
EOS
9254
end
9355

9456
test do
@@ -105,13 +67,13 @@ module Test
10567
port = free_port
10668

10769
(testpath/"Test.cpp").write <<~CPP
70+
#include "Hello.h"
10871
#include <Ice/Ice.h>
109-
#include <Hello.h>
11072
11173
class HelloI : public Test::Hello
11274
{
11375
public:
114-
virtual void sayHello(const Ice::Current&) override {}
76+
void sayHello(const Ice::Current&) override {}
11577
};
11678
11779
int main(int argc, char* argv[])
@@ -125,9 +87,9 @@ class HelloI : public Test::Hello
12587
CPP
12688

12789
system bin/"slice2cpp", "Hello.ice"
128-
system ENV.cxx, "-DICE_CPP11_MAPPING", "-std=c++11", "-c", "-I#{include}", "-I.", "Hello.cpp"
129-
system ENV.cxx, "-DICE_CPP11_MAPPING", "-std=c++11", "-c", "-I#{include}", "-I.", "Test.cpp"
130-
system ENV.cxx, "-L#{lib}", "-o", "test", "Test.o", "Hello.o", "-lIce++11", "-pthread"
90+
system ENV.cxx, "-std=c++20", "-c", "-I#{include}", "Hello.cpp"
91+
system ENV.cxx, "-std=c++20", "-c", "-I#{include}", "Test.cpp"
92+
system ENV.cxx, "-L#{lib}", "-o", "test", "Test.o", "Hello.o", "-lIce", "-lpthread"
13193
system "./test"
13294
end
13395
end

0 commit comments

Comments
 (0)