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 B3535139694 for ; Tue, 14 Mar 2017 23:01:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FD41E0C87; Tue, 14 Mar 2017 23:01:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D758E0C87 for ; Tue, 14 Mar 2017 23:01:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA60033BEBE for ; Tue, 14 Mar 2017 23:01:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BC4D6865 for ; Tue, 14 Mar 2017 23:01:33 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1489532485.20247e5bb4a1d133a17eac3f57ac56defe3f656c.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libFuzzer/, dev-libs/libFuzzer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libFuzzer/files/libFuzzer-3.9.1-32-bit.patch dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild X-VCS-Directories: dev-libs/libFuzzer/ dev-libs/libFuzzer/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 20247e5bb4a1d133a17eac3f57ac56defe3f656c X-VCS-Branch: master Date: Tue, 14 Mar 2017 23:01:33 +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: 103cc0e7-92f5-4765-a1c6-2bdd6f58f89d X-Archives-Hash: 957c8dc9cc0b983525018fba2960eb15 commit: 20247e5bb4a1d133a17eac3f57ac56defe3f656c Author: Mike Frysinger gentoo org> AuthorDate: Tue Mar 14 22:23:01 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Mar 14 23:01:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20247e5b dev-libs/libFuzzer: fix x86 builds #612656 dev-libs/libFuzzer/files/libFuzzer-3.9.1-32-bit.patch | 16 ++++++++++++++++ dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/dev-libs/libFuzzer/files/libFuzzer-3.9.1-32-bit.patch b/dev-libs/libFuzzer/files/libFuzzer-3.9.1-32-bit.patch new file mode 100644 index 00000000000..1257686d1c3 --- /dev/null +++ b/dev-libs/libFuzzer/files/libFuzzer-3.9.1-32-bit.patch @@ -0,0 +1,16 @@ +this code has been rewritten in newer versions so this patch can be thrown +away when we upgrade. + +https://bugs.gentoo.org/612656 + +--- a/FuzzerLoop.cpp ++++ b/FuzzerLoop.cpp +@@ -366,7 +366,7 @@ + double Lambda = 2.0 * log(2.0) / static_cast(MaxCorpusLen); + std::exponential_distribution<> Dist(Lambda); + std::vector Sizes; +- size_t TruncatePoints = std::max(1ul, TruncateMaxRuns / Corpus.size()); ++ size_t TruncatePoints = std::max((size_t)1, TruncateMaxRuns / Corpus.size()); + Sizes.reserve(TruncatePoints); + for (size_t I = 0; I < TruncatePoints; ++I) { + Sizes.push_back(Dist(MD.GetRand().Get_mt19937()) + 1); diff --git a/dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild b/dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild index d9e77c26a7a..43b99e894a9 100644 --- a/dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild +++ b/dev-libs/libFuzzer/libFuzzer-3.9.1.ebuild @@ -19,6 +19,10 @@ IUSE="" S_ROOT="${WORKDIR}/${MY_P}.src" S="${S_ROOT}/lib/Fuzzer" +PATCHES=( + "${FILESDIR}"/${P}-32-bit.patch #612656 +) + src_prepare() { cmake-utils_src_prepare sed -i '/CMAKE_CXX_FLAGS/d' CMakeLists.txt || die