From owner-svn-ports-all@freebsd.org Sun May 12 22:48:20 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE7AF15A4A81; Sun, 12 May 2019 22:48:19 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91AB68E064; Sun, 12 May 2019 22:48:19 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EB83110F; Sun, 12 May 2019 22:48:19 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4CMmJTE015271; Sun, 12 May 2019 22:48:19 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4CMmISK015270; Sun, 12 May 2019 22:48:18 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201905122248.x4CMmISK015270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 12 May 2019 22:48:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501509 - in head/devel/rttr: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/devel/rttr: . files X-SVN-Commit-Revision: 501509 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 91AB68E064 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2019 22:48:20 -0000 Author: adridg Date: Sun May 12 22:48:18 2019 New Revision: 501509 URL: https://svnweb.freebsd.org/changeset/ports/501509 Log: Fix devel/rttr on GCC-based architectures. - Use C++11-capable compiler - Import fix from upstream's upstream, https://github.com/Tencent/rapidjson/commit/fa5963a2f5b231ee2babff771f169ccca22870ed No PORTREVISION bump since it didn't compile before, and the patch doesn't change any functionality. PR: 237697 Submitted by: pkubaj Reported by: pkubaj Added: head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h (contents, props changed) Modified: head/devel/rttr/Makefile Modified: head/devel/rttr/Makefile ============================================================================== --- head/devel/rttr/Makefile Sun May 12 21:21:39 2019 (r501508) +++ head/devel/rttr/Makefile Sun May 12 22:48:18 2019 (r501509) @@ -11,7 +11,7 @@ COMMENT= Run Time Type Reflection LICENSE= MIT -USES= cmake +USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= rttrorg Added: head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h Sun May 12 22:48:18 2019 (r501509) @@ -0,0 +1,40 @@ +--- 3rd_party/rapidjson-1.1.0/rapidjson/document.h.orig 2019-01-18 18:25:46 UTC ++++ 3rd_party/rapidjson-1.1.0/rapidjson/document.h +@@ -1439,7 +1439,7 @@ class GenericValue { (public) + MemberIterator pos = MemberBegin() + (first - MemberBegin()); + for (MemberIterator itr = pos; itr != last; ++itr) + itr->~Member(); +- std::memmove(&*pos, &*last, static_cast(MemberEnd() - last) * sizeof(Member)); ++ std::memmove(static_cast(&*pos), &*last, static_cast(MemberEnd() - last) * sizeof(Member)); + data_.o.size -= static_cast(last - first); + return pos; + } +@@ -1642,8 +1642,8 @@ class GenericValue { (public) + RAPIDJSON_ASSERT(last <= End()); + ValueIterator pos = Begin() + (first - Begin()); + for (ValueIterator itr = pos; itr != last; ++itr) +- itr->~GenericValue(); +- std::memmove(pos, last, static_cast(End() - last) * sizeof(GenericValue)); ++ itr->~GenericValue(); ++ std::memmove(static_cast(pos), last, static_cast(End() - last) * sizeof(GenericValue)); + data_.a.size -= static_cast(last - first); + return pos; + } +@@ -1950,7 +1950,7 @@ class GenericValue { (public) + if (count) { + GenericValue* e = static_cast(allocator.Malloc(count * sizeof(GenericValue))); + SetElementsPointer(e); +- std::memcpy(e, values, count * sizeof(GenericValue)); ++ std::memcpy(static_cast(e), values, count * sizeof(GenericValue)); + } + else + SetElementsPointer(0); +@@ -1963,7 +1963,7 @@ class GenericValue { (public) + if (count) { + Member* m = static_cast(allocator.Malloc(count * sizeof(Member))); + SetMembersPointer(m); +- std::memcpy(m, members, count * sizeof(Member)); ++ std::memcpy(static_cast(m), members, count * sizeof(Member)); + } + else + SetMembersPointer(0);