Skip to content

Commit a5790c8

Browse files
committed
ice 3.8.0
1 parent be581ba commit a5790c8

File tree

1 file changed

+11
-46
lines changed

1 file changed

+11
-46
lines changed

Formula/i/ice.rb

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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
@@ -38,22 +38,9 @@ class Ice < Formula
3838
end
3939

4040
def install
41-
extra_cxxflags = []
4241

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(" ")} "
42+
if DevelopmentTools.clang_build_version < 1700
43+
inreplace "config/Make.rules.Darwin", "-Wl,-max_default_common_align,0x4000", ""
5744
end
5845

5946
args = [
@@ -62,33 +49,11 @@ def install
6249
"USR_DIR_INSTALL=yes", # ensure slice and man files are installed to share
6350
"MCPP_HOME=#{Formula["mcpp"].opt_prefix}",
6451
"LMDB_HOME=#{Formula["lmdb"].opt_prefix}",
65-
"CONFIGS=shared cpp11-shared xcodesdk cpp11-xcodesdk",
52+
"CONFIGS=all",
6653
"PLATFORMS=all",
67-
"SKIP=slice2confluence",
6854
"LANGUAGES=cpp",
6955
]
70-
71-
# Fails with Xcode < 12.5
72-
inreplace "cpp/include/Ice/Object.h", /^#.+"-Wdeprecated-copy-dtor"+/, "" if OS.mac? && MacOS.version <= :catalina
73-
7456
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
9257
end
9358

9459
test do
@@ -105,13 +70,13 @@ module Test
10570
port = free_port
10671

10772
(testpath/"Test.cpp").write <<~CPP
73+
#include "Hello.h"
10874
#include <Ice/Ice.h>
109-
#include <Hello.h>
11075
11176
class HelloI : public Test::Hello
11277
{
11378
public:
114-
virtual void sayHello(const Ice::Current&) override {}
79+
void sayHello(const Ice::Current&) override {}
11580
};
11681
11782
int main(int argc, char* argv[])
@@ -124,10 +89,10 @@ class HelloI : public Test::Hello
12489
}
12590
CPP
12691

127-
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"
92+
system "#{bin}/slice2cpp", "Hello.ice"
93+
system ENV.cxx, "clang++", "-std=c++20", "-c", "-I#{include}", "Hello.cpp"
94+
system ENV.cxx, "clang++", "-std=c++20", "-c", "-I#{include}", "Test.cpp"
95+
system ENV.cxx, "clang++", "-L#{lib}", "-o", "test", "Test.o", "Hello.o", "-lIce", "-lpthread"
13196
system "./test"
13297
end
13398
end

0 commit comments

Comments
 (0)