Index: branches/2016Q4/devel/qbs/files/patch-git_5c1183a =================================================================== --- branches/2016Q4/devel/qbs/files/patch-git_5c1183a (nonexistent) +++ branches/2016Q4/devel/qbs/files/patch-git_5c1183a (revision 427426) @@ -0,0 +1,36 @@ +This fixes a build failure with libc++ 3.9.0 (FreeBSD 12+): + +In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/api/internaljobs.cpp:39: +In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:45: +/usr/include/c++/v1/queue:400:5: error: static_assert failed "" + static_assert((is_same<_Tp, value_type>::value), "" ); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:156:12: note: in instantiation of template class 'std::__1::priority_queue >, qbs::Internal::Executor::ComparePriority>' requested here + Leaves m_leaves; + +commit 5c1183aa377ae8de487d5541360369ebd2ee0f6b +Author: Christian Kandeler +Date: Mon Nov 28 14:54:43 2016 +0100 + + Executor: Fix undefined behavior + + C++17 introduces new requirements on the template parameters of + std::priority_queue. + + Task-number: QBS-1051 + Change-Id: I9a22b8f2d3c1f0bd532b0a76f5d2a16bebc303f7 + Reviewed-by: Raphael Kubo da Costa + Reviewed-by: Joerg Bornemann + +--- src/lib/corelib/buildgraph/executor.h ++++ src/lib/corelib/buildgraph/executor.h +@@ -107,7 +107,8 @@ private: + bool operator() (const BuildGraphNode *x, const BuildGraphNode *y) const; + }; + +- typedef std::priority_queue, ComparePriority> Leaves; ++ typedef std::priority_queue, ++ ComparePriority> Leaves; + + void doBuild(); + void prepareAllNodes(); Property changes on: branches/2016Q4/devel/qbs/files/patch-git_5c1183a ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q4 =================================================================== --- branches/2016Q4 (revision 427425) +++ branches/2016Q4 (revision 427426) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r427385