Date: Thu, 14 Apr 2016 11:08:53 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413257 - in head/www: node012/files node4/files Message-ID: <201604141108.u3EB8rie050406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu Apr 14 11:08:52 2016 New Revision: 413257 URL: https://svnweb.freebsd.org/changeset/ports/413257 Log: www/node012 www/node4: Fix build with libc++ 3.8.0 PR: 208467 Submitted by: dim Approved by: Bradley T. Hughes <bradleythughes@fastmail.fm> (maintainer) Added: head/www/node012/files/patch-deps_v8_src_compiler_instruction.h (contents, props changed) head/www/node4/files/ head/www/node4/files/patch-deps_v8_src_compiler_instruction.h (contents, props changed) head/www/node4/files/patch-deps_v8_src_compiler_js-type-feedback.h (contents, props changed) head/www/node4/files/patch-deps_v8_src_zone-containers.h (contents, props changed) Added: head/www/node012/files/patch-deps_v8_src_compiler_instruction.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node012/files/patch-deps_v8_src_compiler_instruction.h Thu Apr 14 11:08:52 2016 (r413257) @@ -0,0 +1,11 @@ +--- deps/v8/src/compiler/instruction.h.orig 2016-03-31 23:26:45 UTC ++++ deps/v8/src/compiler/instruction.h +@@ -722,7 +722,7 @@ OStream& operator<<(OStream& os, const C + + typedef std::deque<Constant, zone_allocator<Constant> > ConstantDeque; + typedef std::map<int, Constant, std::less<int>, +- zone_allocator<std::pair<int, Constant> > > ConstantMap; ++ zone_allocator<std::pair<const int, Constant> > > ConstantMap; + + + typedef std::deque<Instruction*, zone_allocator<Instruction*> > Added: head/www/node4/files/patch-deps_v8_src_compiler_instruction.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node4/files/patch-deps_v8_src_compiler_instruction.h Thu Apr 14 11:08:52 2016 (r413257) @@ -0,0 +1,11 @@ +--- deps/v8/src/compiler/instruction.h.orig 2016-04-01 00:47:45 UTC ++++ deps/v8/src/compiler/instruction.h +@@ -1011,7 +1011,7 @@ class InstructionBlock final : public Zo + + typedef ZoneDeque<Constant> ConstantDeque; + typedef std::map<int, Constant, std::less<int>, +- zone_allocator<std::pair<int, Constant> > > ConstantMap; ++ zone_allocator<std::pair<const int, Constant> > > ConstantMap; + + typedef ZoneDeque<Instruction*> InstructionDeque; + typedef ZoneDeque<ReferenceMap*> ReferenceMapDeque; Added: head/www/node4/files/patch-deps_v8_src_compiler_js-type-feedback.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node4/files/patch-deps_v8_src_compiler_js-type-feedback.h Thu Apr 14 11:08:52 2016 (r413257) @@ -0,0 +1,15 @@ +--- deps/v8/src/compiler/js-type-feedback.h.orig 2016-04-01 00:47:45 UTC ++++ deps/v8/src/compiler/js-type-feedback.h +@@ -33,9 +33,10 @@ class JSTypeFeedbackTable : public ZoneO + private: + friend class JSTypeFeedbackSpecializer; + typedef std::map<NodeId, TypeFeedbackId, std::less<NodeId>, +- zone_allocator<TypeFeedbackId> > TypeFeedbackIdMap; ++ zone_allocator<std::pair<const NodeId, TypeFeedbackId> > > ++ TypeFeedbackIdMap; + typedef std::map<NodeId, FeedbackVectorICSlot, std::less<NodeId>, +- zone_allocator<FeedbackVectorICSlot> > ++ zone_allocator<std::pair<const NodeId, FeedbackVectorICSlot> > > + FeedbackVectorICSlotMap; + + TypeFeedbackIdMap type_feedback_id_map_; Added: head/www/node4/files/patch-deps_v8_src_zone-containers.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node4/files/patch-deps_v8_src_zone-containers.h Thu Apr 14 11:08:52 2016 (r413257) @@ -0,0 +1,18 @@ +--- deps/v8/src/zone-containers.h.orig 2016-04-01 00:47:46 UTC ++++ deps/v8/src/zone-containers.h +@@ -114,12 +114,12 @@ class ZoneSet : public std::set<K, Compa + // a zone allocator. + template <typename K, typename V, typename Compare = std::less<K>> + class ZoneMap +- : public std::map<K, V, Compare, zone_allocator<std::pair<K, V>>> { ++ : public std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>> { + public: + // Constructs an empty map. + explicit ZoneMap(Zone* zone) +- : std::map<K, V, Compare, zone_allocator<std::pair<K, V>>>( +- Compare(), zone_allocator<std::pair<K, V>>(zone)) {} ++ : std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>>( ++ Compare(), zone_allocator<std::pair<const K, V>>(zone)) {} + }; + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604141108.u3EB8rie050406>