vlc/vlc-2.1 | branch: master | Konstantin Pavlov <[email protected]> | Sat Aug 31 18:52:48 2013 +0400| [39c35bfcce9c2fbf77940e4dfb7e1f627fce644b] | committer: Felix Paul Kühne
extras/tools: fix ragel build with clang on OSX Mavericks (cherry picked from commit 994dfedd6b5abf8833c20a07e9de219b62787c13) Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=39c35bfcce9c2fbf77940e4dfb7e1f627fce644b --- extras/tools/ragel-6.8-javacodegen.patch | 11 +++++++++++ extras/tools/tools.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/extras/tools/ragel-6.8-javacodegen.patch b/extras/tools/ragel-6.8-javacodegen.patch new file mode 100644 index 0000000..ff558b9 --- /dev/null +++ b/extras/tools/ragel-6.8-javacodegen.patch @@ -0,0 +1,11 @@ +diff -urN ragel-6.8.orig/ragel/javacodegen.cpp ragel-6.8/ragel/javacodegen.cpp +--- ragel-6.8.orig/ragel/javacodegen.cpp 2013-02-11 05:57:45.000000000 +0400 ++++ ragel-6.8/ragel/javacodegen.cpp 2013-09-01 14:42:27.000000000 +0400 +@@ -50,6 +50,7 @@ + using std::ifstream; + using std::ostream; + using std::ios; ++using std::setiosflags; + using std::cin; + using std::cout; + using std::cerr; diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index f7efcfa..a009a60 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -240,6 +240,7 @@ ragel: ragel-$(RAGEL_VERSION).tar.gz $(MOVE) .ragel: ragel + $(APPLY) ragel-6.8-javacodegen.patch (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
