diff options
| author | dpwrussell | 2013-11-15 00:32:15 +0000 |
|---|---|---|
| committer | Jack Nagel | 2013-11-19 13:30:34 -0600 |
| commit | 5d33277604638f3cefe79c6592e2c19604f22c2c (patch) | |
| tree | e70cdf40a6290a1c5898208ec62f4d7f01226e2d /Library/Formula | |
| parent | a4cb81cd07d0e1c327c876c0331b82f6ae72db44 (diff) | |
| download | homebrew-5d33277604638f3cefe79c6592e2c19604f22c2c.tar.bz2 | |
ice: fix build against libc++
Closes #24368.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ice.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Library/Formula/ice.rb b/Library/Formula/ice.rb index 62c6d6832..0a6bc84dc 100644 --- a/Library/Formula/ice.rb +++ b/Library/Formula/ice.rb @@ -108,3 +108,23 @@ diff -urN Ice-3.5.1.original/py/config/Make.rules.Darwin Ice-3.5.1/py/config/Mak -endif - -PYTHON_INCLUDE_DIR = $(PYTHON_HOME)/include/$(PYTHON_VERSION) +diff -urN Ice-3.5.1.original/cpp/src/IceGrid/DescriptorHelper.h Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h +--- Ice-3.5.1.original/cpp/src/IceGrid/DescriptorHelper.h 2013-10-04 16:48:14.000000000 +0100 ++++ Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h 2013-11-15 00:11:22.000000000 +0000 +@@ -247,7 +247,6 @@ + ServerInstanceHelper(const ServerInstanceDescriptor&, const Resolver&, bool); + ServerInstanceHelper(const ServerDescriptorPtr&, const Resolver&, bool); + +- void operator=(const ServerInstanceHelper&); + bool operator==(const ServerInstanceHelper&) const; + bool operator!=(const ServerInstanceHelper&) const; + +@@ -265,7 +264,7 @@ + + void init(const ServerDescriptorPtr&, const Resolver&, bool); + +- const ServerInstanceDescriptor _def; ++ ServerInstanceDescriptor _def; + std::string _id; + ServerInstanceDescriptor _instance; + |