From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91F6B139694 for ; Sun, 30 Jul 2017 09:10:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF0A91FC1BA; Sun, 30 Jul 2017 09:10:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DA0B1FC1BA for ; Sun, 30 Jul 2017 09:10:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 821E43418A1 for ; Sun, 30 Jul 2017 09:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5CFF74D3 for ; Sun, 30 Jul 2017 09:10:07 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1501405796.7740aaf860fb686e087e174158dacf4f7c8051b2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/files/, dev-cpp/yaml-cpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild X-VCS-Directories: dev-cpp/yaml-cpp/files/ dev-cpp/yaml-cpp/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7740aaf860fb686e087e174158dacf4f7c8051b2 X-VCS-Branch: master Date: Sun, 30 Jul 2017 09:10:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0b6e73de-ca77-4436-882b-c02e53638dd8 X-Archives-Hash: 9f99955df7f3e56350d7a3f00f205899 commit: 7740aaf860fb686e087e174158dacf4f7c8051b2 Author: Peter Levine gmail com> AuthorDate: Mon Jul 24 06:25:27 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jul 30 09:09:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7740aaf8 dev-cpp/yaml-cpp: Fix test failure with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=609176 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5191 dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch | 44 ++++++++++++++++++++++++ dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild | 2 ++ 2 files changed, 46 insertions(+) diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch new file mode 100644 index 00000000000..88ee25fa0ac --- /dev/null +++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch @@ -0,0 +1,44 @@ +Bug: https://bugs.gentoo.org/609176 +Upstream PR: https://github.com/jbeder/yaml-cpp/pull/514 + +From a83a1b3a7bd0a5a4eb458d898b057f6a8d409b7e Mon Sep 17 00:00:00 2001 +From: Peter-Levine +Date: Mon, 24 Jul 2017 02:00:24 -0400 +Subject: [PATCH] Fix segfault in gmock when running tests + +Taken from https://github.com/google/googletest/issues/705#issuecomment-235067917 +--- + test/gmock-1.7.0/include/gmock/gmock-spec-builders.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h +index 312fbe87..2dd733b6 100644 +--- a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h ++++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h +@@ -1370,6 +1370,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase { + template <> + class ActionResultHolder : public UntypedActionResultHolderBase { + public: ++ explicit ActionResultHolder() {} ++ + void GetValueAndDelete() const { delete this; } + + virtual void PrintAsActionResult(::std::ostream* /* os */) const {} +@@ -1381,7 +1383,7 @@ class ActionResultHolder : public UntypedActionResultHolderBase { + const typename Function::ArgumentTuple& args, + const string& call_description) { + func_mocker->PerformDefaultAction(args, call_description); +- return NULL; ++ return new ActionResultHolder(); + } + + // Performs the given action and returns NULL. +@@ -1390,7 +1392,7 @@ class ActionResultHolder : public UntypedActionResultHolderBase { + const Action& action, + const typename Function::ArgumentTuple& args) { + action.Perform(args); +- return NULL; ++ return new ActionResultHolder(); + } + }; + diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild index a857f75d61b..503d7e2b9ff 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild @@ -19,6 +19,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-release-${PV}" +PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) + src_prepare() { sed -i \ -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \