Date: Fri, 10 Aug 2018 13:01:52 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r476830 - branches/2018Q3/devel/codeblocks-devel/files Message-ID: <201808101301.w7AD1qYf064687@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Aug 10 13:01:51 2018 New Revision: 476830 URL: https://svnweb.freebsd.org/changeset/ports/476830 Log: MFH: r476829 devel/codeblocks-devel: unbreak with libc++ 5 In file included from sqvm.cpp:5: In file included from /usr/include/c++/v1/math.h:310: /usr/include/c++/v1/limits:148:85: error: expected expression _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();} ^ ../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type' #define type(obj) ((obj)._type) ^ Submitted by: Michael Butler (based on) Approved by: ports-secteam blanket Added: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp - copied unchanged from r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp Modified: Directory Properties: branches/2018Q3/ (props changed) Copied: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp (from r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp Fri Aug 10 13:01:51 2018 (r476830, copy of r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp) @@ -0,0 +1,24 @@ +After https://reviews.llvm.org/rL301060 build fails: + +In file included from sqvm.cpp:5: +In file included from /usr/include/c++/v1/math.h:310: +/usr/include/c++/v1/limits:148:85: error: expected expression + _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();} + ^ +../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + ^ + +--- src/sdk/scripting/squirrel/sqvm.cpp.orig 2013-08-18 05:51:11 UTC ++++ src/sdk/scripting/squirrel/sqvm.cpp +@@ -1,9 +1,9 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include <math.h> + #include <stdlib.h> ++#include "sqpcheader.h" + #include "sqopcodes.h" + #include "sqfuncproto.h" + #include "sqvm.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808101301.w7AD1qYf064687>