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 CA34B138334 for ; Mon, 11 Mar 2019 04:48:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82195E0BE3; Mon, 11 Mar 2019 04:48:13 +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 58D6BE0BE0 for ; Mon, 11 Mar 2019 04:48:13 +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 A3122335C71 for ; Mon, 11 Mar 2019 04:48:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BBEF567 for ; Mon, 11 Mar 2019 04:48:10 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1552279596.13cdef93017ab33bd801fd0596bf94ea90ffbf74.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ninja/files/ninja-uclibc.patch X-VCS-Directories: dev-util/ninja/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 13cdef93017ab33bd801fd0596bf94ea90ffbf74 X-VCS-Branch: master Date: Mon, 11 Mar 2019 04:48:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 606f7d0d-ea09-4fc2-8309-b03493de4e04 X-Archives-Hash: b1a814b2d5c916ad886af64e32c0e231 commit: 13cdef93017ab33bd801fd0596bf94ea90ffbf74 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Mar 5 16:58:11 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 11 04:46:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cdef93 dev-util/ninja: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11274 Signed-off-by: Aaron Bauman gentoo.org> dev-util/ninja/files/ninja-uclibc.patch | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dev-util/ninja/files/ninja-uclibc.patch b/dev-util/ninja/files/ninja-uclibc.patch deleted file mode 100644 index e87eea84272..00000000000 --- a/dev-util/ninja/files/ninja-uclibc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/util.cc b/src/util.cc -index e31fd1f..1caa1ce 100644 ---- a/src/util.cc -+++ b/src/util.cc -@@ -585,6 +585,13 @@ double GetLoadAverage() { - // Calculation taken from comment in libperfstats.h - return double(cpu_stats.loadavg[0]) / double(1 << SBITS); - } -+#elif defined(__UCLIBC__) -+double GetLoadAverage() { -+ struct sysinfo si; -+ if (sysinfo(&si) != 0) -+ return -0.0f; -+ return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0]; -+} - #else - double GetLoadAverage() { - double loadavg[3] = { 0.0f, 0.0f, 0.0f };