aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Orban2014-02-12 20:23:29 -0800
committerMike McQuaid2014-02-14 19:24:03 +0000
commitb8230bd59d5544cba33ab9a4e97f25ee952adf91 (patch)
tree7ed4934ea119826f9cc235526469670fa5372eb6
parent2fe5763d95eceb05a188322f5c10e15fceb69d75 (diff)
downloadhomebrew-b8230bd59d5544cba33ab9a4e97f25ee952adf91.tar.bz2
cgal: add patch for clang 425 in C++11 mode.
Closes #26684. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
-rw-r--r--Library/Formula/cgal.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/Library/Formula/cgal.rb b/Library/Formula/cgal.rb
index 234499258..aef08c0cc 100644
--- a/Library/Formula/cgal.rb
+++ b/Library/Formula/cgal.rb
@@ -24,6 +24,11 @@ class Cgal < Formula
depends_on 'qt' if build.include? 'imaging'
depends_on 'eigen' if build.include? 'with-eigen3'
+ def patches
+ # Allows to compile with clang 425: http://goo.gl/y9Dg2y
+ DATA
+ end
+
def install
ENV.cxx11 if build.cxx11?
args = ["-DCMAKE_INSTALL_PREFIX=#{prefix}",
@@ -44,3 +49,19 @@ class Cgal < Formula
system "make install"
end
end
+
+__END__
+diff --git a/src/CGAL/File_header_extended_OFF.cpp b/src/CGAL/File_header_extended_OFF.cpp
+index 3f709ff..f0e5bd3 100644
+--- a/src/CGAL/File_header_extended_OFF.cpp
++++ b/src/CGAL/File_header_extended_OFF.cpp
+@@ -186,7 +186,8 @@ std::istream& operator>>( std::istream& in, File_header_extended_OFF& h) {
+ }
+ in >> keyword;
+ }
+- in >> skip_until_EOL >> skip_comment_OFF;
++ skip_until_EOL(in);
++ skip_comment_OFF(in);
+ return in;
+ }
+ #undef CGAL_IN