fixes for clang

This commit is contained in:
espie 2017-05-23 21:01:46 +00:00
parent 33552f240e
commit 6f62b39e9e
2 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2017/04/10 11:46:35 sthen Exp $ # $OpenBSD: Makefile,v 1.15 2017/05/23 21:01:46 espie Exp $
# XXX check if still needed at next update # XXX check if still needed at next update
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
@ -28,9 +28,7 @@ MODULES = devel/gettext
# XXX should use lua module # XXX should use lua module
# c++11 # c++11
MODULES += gcc4 WANT_CXX = base gcc
MODGCC4_ARCHS= *
MODGCC4_LANGS= c++
USE_GROFF = Yes USE_GROFF = Yes

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_cc_options_h,v 1.3 2015/06/29 07:14:10 jasper Exp $ $OpenBSD: patch-src_cc_options_h,v 1.4 2017/05/23 21:01:46 espie Exp $
Add explicit <iostream> includes, fixes build with Boost 1.56 Add explicit <iostream> includes, fixes build with Boost 1.56
https://github.com/legatvs/cclive/pull/2 https://github.com/legatvs/cclive/pull/2
--- src/cc/options.h.orig Sat Nov 23 10:46:27 2013 Index: src/cc/options.h
+++ src/cc/options.h Sun Jun 28 21:43:12 2015 --- src/cc/options.h.orig
+++ src/cc/options.h
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@ -13,3 +14,12 @@ https://github.com/legatvs/cclive/pull/2
#include <fstream> #include <fstream>
#include <ccerror> #include <ccerror>
@@ -746,7 +747,7 @@ struct options : boost::noncopyable (private)
#endif
<< "\n built on " << BUILD_TIME
<< " for " << CANONICAL_TARGET
- << "\n with " << CXX", "CXXFLAGS
+ << "\n with " << CXX ", " CXXFLAGS
<< "\n libquvi " << quvi::version()
<< "\n libquvi-scripts "
<< quvi_version(QUVI_VERSION_SCRIPTS)