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 84D3A138334 for ; Sat, 22 Sep 2018 07:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F0B1E087A; Sat, 22 Sep 2018 07:07:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 46B9FE087A for ; Sat, 22 Sep 2018 07:07:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 F2977335D0A for ; Sat, 22 Sep 2018 07:07:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABC5E3E2 for ; Sat, 22 Sep 2018 07:07:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1537600031.f70d38f0e1dbfa1a590b6285be3f7f9fe37a939a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/gtest/gtest-9999.ebuild X-VCS-Directories: dev-cpp/gtest/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f70d38f0e1dbfa1a590b6285be3f7f9fe37a939a X-VCS-Branch: master Date: Sat, 22 Sep 2018 07:07:26 +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: fc425f85-2e74-4031-a9a3-00a7813ff948 X-Archives-Hash: d33a1cadfeda25df29f81ebd128e8a6c commit: f70d38f0e1dbfa1a590b6285be3f7f9fe37a939a Author: Peter Levine gmail com> AuthorDate: Tue Sep 18 21:28:38 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Sep 22 07:07:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70d38f0 dev-cpp/gtest: Remove -Werror flag from build Causes build failure E.g., https://github.com/google/googletest/issues/1584 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-cpp/gtest/gtest-9999.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild index a2e7c57c55e..a1cb73bf993 100644 --- a/dev-cpp/gtest/gtest-9999.ebuild +++ b/dev-cpp/gtest/gtest-9999.ebuild @@ -6,7 +6,7 @@ EAPI="6" # Python is required for tests and some build tasks. PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) -inherit python-any-r1 cmake-multilib +inherit cmake-multilib python-any-r1 if [[ ${PV} == "9999" ]]; then inherit git-r3 @@ -36,6 +36,13 @@ pkg_setup() { use test && python-any-r1_pkg_setup } +src_prepare() { + cmake-utils_src_prepare + + sed -i -e '/set(cxx_base_flags /s:-Werror::' \ + googletest/cmake/internal_utils.cmake || die "sed failed!" +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_GMOCK=ON