* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2021-01-11 17:47 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2021-01-11 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 4add4f893cf2fb16b18d3c15bc9948a80802b66f
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Jan 9 21:37:54 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 17:45:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4add4f89
dev-cpp/benchmark: Add patch to fix build failure on gcc-11
Closes: https://bugs.gentoo.org/764647
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19012
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-cpp/benchmark/benchmark-1.5.2.ebuild | 4 +++
...chmark-1.5.2-Add-missing-limits-inclusion.patch | 30 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/dev-cpp/benchmark/benchmark-1.5.2.ebuild b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
index 396642b38c3..e3a3e8cfb6e 100644
--- a/dev-cpp/benchmark/benchmark-1.5.2.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
@@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/${P}-Add-missing-limits-inclusion.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DBENCHMARK_ENABLE_TESTING=$(usex test)
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch b/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
new file mode 100644
index 00000000000..42bdbbef1f4
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
@@ -0,0 +1,30 @@
+From 3d1c2677686718d906f28c1d4da001c42666e6d2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@inbox.ru>
+Date: Thu, 15 Oct 2020 09:12:40 +0100
+Subject: [PATCH] src/benchmark_register.h: add missing <limits> inclusion
+ (#1060)
+
+Noticed missing header when was building llvm with gcc-11:
+
+```
+llvm-project/llvm/utils/benchmark/src/benchmark_register.h:17:30:
+ error: 'numeric_limits' is not a member of 'std'
+ 17 | static const T kmax = std::numeric_limits<T>::max();
+ | ^~~~~~~~~~~~~~
+```
+---
+ src/benchmark_register.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/benchmark_register.h b/src/benchmark_register.h
+index 61377d74..204bf1d9 100644
+--- a/src/benchmark_register.h
++++ b/src/benchmark_register.h
+@@ -1,6 +1,7 @@
+ #ifndef BENCHMARK_REGISTER_H
+ #define BENCHMARK_REGISTER_H
+
++#include <limits>
+ #include <vector>
+
+ #include "check.h"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2021-05-12 10:53 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-05-12 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 95d62431a677825bb3a3e897373b1937b47ec36d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 10:29:18 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed May 12 10:53:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d62431
dev-cpp/benchmark: drop 1.5.1, 1.5.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-cpp/benchmark/Manifest | 2 --
dev-cpp/benchmark/benchmark-1.5.1.ebuild | 26 ------------------
dev-cpp/benchmark/benchmark-1.5.2.ebuild | 32 ----------------------
...chmark-1.5.2-Add-missing-limits-inclusion.patch | 30 --------------------
4 files changed, 90 deletions(-)
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 483606d8a3c..cf0403114df 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1 @@
-DIST benchmark-1.5.1.tar.gz 154896 BLAKE2B cb8d74b3e6662e35ea12809d8b62d1e3a6849668840c84697e7f4b2d29eaf68688bb1cda6f43c170e70366de88a93af79bb709d55dfc8d79140c11a31855a46b SHA512 1e8782ab6846b8b29c5eea41ed1ba19dd92a46a135cf74acdc588e2cd5ef05581c644d20fc0d6403456d65417538e1db80109ae87989601298b2fc56ae3c3161
-DIST benchmark-1.5.2.tar.gz 160235 BLAKE2B af14235d174e39b8bbb0a44960834b7d13b1aed6cd4494efa9eb58d32c051efdf244258a33b83b82ad82aa69917356c35ccb470caea838cb6fd7eda37f0f80f6 SHA512 a071613f3af669296aa613e0e64726bdcf27cc3db331d8003f49164581cd6935a86641ec435118ea590a9d722a926d3fef740e938e1a5f6eba8e2a5a615da1b0
DIST benchmark-1.5.3.tar.gz 163465 BLAKE2B cea8929c5595be55e74e6232eb147a00c656cc5afe6f5b9d3d788de002c51c40c46012461a7c6840aff9e590ed4304f24a31249402bbbeae28ec443a433a2e53 SHA512 11f726686ad8b36870fc2a3542fad4c52a58df2eb580564dcfdfb154fe6ac00dbbf69c514395148d7ab11a45e40e869549cf971462c384f59cbae5fa60160e3b
diff --git a/dev-cpp/benchmark/benchmark-1.5.1.ebuild b/dev-cpp/benchmark/benchmark-1.5.1.ebuild
deleted file mode 100644
index 9bd77a6ce51..00000000000
--- a/dev-cpp/benchmark/benchmark-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.5.2.ebuild b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
deleted file mode 100644
index ce8b8f24aa8..00000000000
--- a/dev-cpp/benchmark/benchmark-1.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-Add-missing-limits-inclusion.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- )
-
- use debug || append-cppflags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch b/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
deleted file mode 100644
index 42bdbbef1f4..00000000000
--- a/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d1c2677686718d906f28c1d4da001c42666e6d2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@inbox.ru>
-Date: Thu, 15 Oct 2020 09:12:40 +0100
-Subject: [PATCH] src/benchmark_register.h: add missing <limits> inclusion
- (#1060)
-
-Noticed missing header when was building llvm with gcc-11:
-
-```
-llvm-project/llvm/utils/benchmark/src/benchmark_register.h:17:30:
- error: 'numeric_limits' is not a member of 'std'
- 17 | static const T kmax = std::numeric_limits<T>::max();
- | ^~~~~~~~~~~~~~
-```
----
- src/benchmark_register.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/benchmark_register.h b/src/benchmark_register.h
-index 61377d74..204bf1d9 100644
---- a/src/benchmark_register.h
-+++ b/src/benchmark_register.h
-@@ -1,6 +1,7 @@
- #ifndef BENCHMARK_REGISTER_H
- #define BENCHMARK_REGISTER_H
-
-+#include <limits>
- #include <vector>
-
- #include "check.h"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2021-08-13 16:31 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-08-13 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 599c870148fe47f5def0ce12497da2bd05ba0be1
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 16:28:46 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 16:31:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599c8701
dev-cpp/benchmark: add 1.5.6
Have successfully made the ebuild run tests depending on dev-cpp/gtest
too, however since the required version of the latter is not in the tree
yet the committed ebuild has that bit disabled.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-cpp/benchmark/Manifest | 1 +
dev-cpp/benchmark/benchmark-1.5.6.ebuild | 36 ++++++++++++++++++++++
.../files/benchmark-1.5.6-system_testdeps.patch | 11 +++++++
3 files changed, 48 insertions(+)
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 764ba4cd0a7..6b5cf54159c 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1,3 @@
DIST benchmark-1.5.3.tar.gz 163465 BLAKE2B cea8929c5595be55e74e6232eb147a00c656cc5afe6f5b9d3d788de002c51c40c46012461a7c6840aff9e590ed4304f24a31249402bbbeae28ec443a433a2e53 SHA512 11f726686ad8b36870fc2a3542fad4c52a58df2eb580564dcfdfb154fe6ac00dbbf69c514395148d7ab11a45e40e869549cf971462c384f59cbae5fa60160e3b
DIST benchmark-1.5.5.tar.gz 176710 BLAKE2B 394f8b34873ccd45100e3b1f58dd7819d443733d9224ff003a9410ca30d8bacc6c7736b74dd50623144767e840dbc3cd9ff819a60de6e22a00b1edaf802f0992 SHA512 91a2cdf0245625c657b9bb8d76c7d616a99eaed333e42b34ceff4e996b8fa6027b1c7313a815e7b441d2f6e2e1244c139a0911d585bf0d2e767ac3cea23a67d1
+DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
new file mode 100644
index 00000000000..f0322cb58a4
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+
+RESTRICT="!test? ( test )"
+
+# Version not in the tree yet
+#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBENCHMARK_ENABLE_TESTING=$(usex test)
+ -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+ -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+ )
+
+ use debug || append-cppflags -DNDEBUG
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
new file mode 100644
index 00000000000..98aa9490407
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -307,7 +307,7 @@
+ if (BENCHMARK_ENABLE_GTEST_TESTS AND
+ NOT (TARGET gtest AND TARGET gtest_main AND
+ TARGET gmock AND TARGET gmock_main))
+- include(GoogleTest)
++ find_package(GTest 1.11 REQUIRED)
+ endif()
+ add_subdirectory(test)
+ endif()
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2022-03-01 16:47 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-03-01 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 87062497878290a363a959c5538eb5efdcd85cef
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 15:24:46 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 16:47:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87062497
dev-cpp/benchmark: drop 1.5.6, 1.6.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-cpp/benchmark/Manifest | 2 --
dev-cpp/benchmark/benchmark-1.5.6.ebuild | 36 --------------------
dev-cpp/benchmark/benchmark-1.6.0.ebuild | 38 ----------------------
.../files/benchmark-1.5.6-system_testdeps.patch | 11 -------
.../files/benchmark-1.6.0-disable_Werror.patch | 12 -------
.../files/benchmark-1.6.0-versioned_docdir.patch | 9 -----
6 files changed, 108 deletions(-)
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index d96cd79330ba..8c7d92a34184 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1 @@
-DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
-DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
deleted file mode 100644
index 3c1508d4ecd1..000000000000
--- a/dev-cpp/benchmark/benchmark-1.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-
-RESTRICT="!test? ( test )"
-
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- )
-
- use debug || append-cppflags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
deleted file mode 100644
index 79dd281a1d6d..000000000000
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-
-RESTRICT="!test? ( test )"
-
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
- "${FILESDIR}"/${PN}-1.6.0-disable_Werror.patch
- "${FILESDIR}"/${PN}-1.6.0-versioned_docdir.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- )
-
- use debug || append-cppflags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
deleted file mode 100644
index 98aa94904075..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -307,7 +307,7 @@
- if (BENCHMARK_ENABLE_GTEST_TESTS AND
- NOT (TARGET gtest AND TARGET gtest_main AND
- TARGET gmock AND TARGET gmock_main))
-- include(GoogleTest)
-+ find_package(GTest 1.11 REQUIRED)
- endif()
- add_subdirectory(test)
- endif()
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
deleted file mode 100644
index 8a3de98008ea..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,9 +160,6 @@
- add_cxx_compiler_flag(-Wall)
- add_cxx_compiler_flag(-Wextra)
- add_cxx_compiler_flag(-Wshadow)
-- add_cxx_compiler_flag(-Werror RELEASE)
-- add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
-- add_cxx_compiler_flag(-Werror MINSIZEREL)
- if (NOT BENCHMARK_ENABLE_TESTING)
- # Disable warning when compiling tests as gtest does not use 'override'.
- add_cxx_compiler_flag(-Wsuggest-override)
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
deleted file mode 100644
index 156e8b0c2a67..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -120,5 +120,5 @@
-
- install(
- DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
- endif()
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2024-03-21 2:41 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-21 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 49b492cfbba12d2fa7c681e384ea967f5a800937
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Mar 12 19:42:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 02:27:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b492cf
dev-cpp/benchmark: add patches for alpha architecture
Accepted upstream already.
See: https://github.com/google/benchmark/pull/1753
See: https://github.com/google/benchmark/pull/1756
Bug: https://bugs.gentoo.org/922877
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/35729
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild | 39 +++++++++
.../files/benchmark-1.8.3-backport-pr1753.patch | 94 ++++++++++++++++++++++
.../files/benchmark-1.8.3-backport-pr1756.patch | 89 ++++++++++++++++++++
3 files changed, 222 insertions(+)
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..5c20bb79f760
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-text/doxygen )
+ test? ( >=dev-cpp/gtest-1.11.0 )"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch"
+ "${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch"
+ "${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+ -DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
+ -DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
+ -DBENCHMARK_ENABLE_TESTING=$(usex test)
+ -DBENCHMARK_ENABLE_WERROR=OFF
+ -DBENCHMARK_USE_BUNDLED_GTEST=OFF
+ )
+
+ use debug || append-cppflags -DNDEBUG
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
new file mode 100644
index 000000000000..1c2516c38e37
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/922877
+https://github.com/google/benchmark/pull/1753
+
+From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Feb 2024 21:38:11 -0500
+Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture
+
+As documented, the real cycle counter is unsafe to use here, because it
+is a 32-bit integer which wraps every ~4s. Use gettimeofday instead,
+which has a limitation of a low-precision real-time-clock (~1ms), but no
+wrapping. Passes test suite.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/cycleclock.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/cycleclock.h b/src/cycleclock.h
+index 931bba146..eff563e7f 100644
+--- a/src/cycleclock.h
++++ b/src/cycleclock.h
+@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
+ uint64_t pcycle;
+ asm volatile("%0 = C15:14" : "=r"(pcycle));
+ return static_cast<double>(pcycle);
++#elif defined(__alpha__)
++ // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit
++ // integer and thus wraps every ~4s, making using it for tick counts
++ // unreliable beyond this time range. The real-time clock is low-precision,
++ // roughtly ~1ms, but it is the only option that can reasonable count
++ // indefinitely.
++ struct timeval tv;
++ gettimeofday(&tv, nullptr);
++ return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
+ #else
+ // The soft failover to a generic implementation is automatic only for ARM.
+ // For other platforms the developer is expected to make an attempt to create
+
+From b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Feb 2024 21:46:06 -0500
+Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha
+
+And also, bail out if unable to parse /proc/cpuinfo. This will
+preemptively alert users on platforms that need custom code for parsing
+/proc/cpuinfo.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/sysinfo.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sysinfo.cc b/src/sysinfo.cc
+index 04d64dc5b..786bb1b41 100644
+--- a/src/sysinfo.cc
++++ b/src/sysinfo.cc
+@@ -513,7 +513,11 @@ int GetNumCPUs() {
+ std::cerr << "failed to open /proc/cpuinfo\n";
+ return -1;
+ }
++#if defined(__alpha__)
++ const std::string Key = "cpus detected";
++#else
+ const std::string Key = "processor";
++#endif
+ std::string ln;
+ while (std::getline(f, ln)) {
+ if (ln.empty()) continue;
+
+From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Feb 2024 21:49:24 -0500
+Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ test/user_counters_tabular_test.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc
+index 3e8fb1bf0..ffd3c0992 100644
+--- a/test/user_counters_tabular_test.cc
++++ b/test/user_counters_tabular_test.cc
+@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header,"
+
+ void BM_Counters_Tabular(benchmark::State& state) {
+ for (auto _ : state) {
++ // This test requires a non-zero CPU time to avoid divide-by-zero
++ auto iterations = state.iterations();
++ benchmark::DoNotOptimize(iterations);
+ }
+ namespace bm = benchmark;
+ state.counters.insert({
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
new file mode 100644
index 000000000000..6744d3cf212f
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/922877
+https://github.com/google/benchmark/pull/1756
+
+From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 13 Feb 2024 20:23:20 -0500
+Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure
+
+Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs
+never returns fewer than one CPU. There is no reasonable way to
+continue if we are unable to identify the number of CPUs.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/sysinfo.cc | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/src/sysinfo.cc b/src/sysinfo.cc
+index 786bb1b41..daeb98b02 100644
+--- a/src/sysinfo.cc
++++ b/src/sysinfo.cc
+@@ -474,12 +474,11 @@ std::string GetSystemName() {
+ #endif // Catch-all POSIX block.
+ }
+
+-int GetNumCPUs() {
++int GetNumCPUsImpl() {
+ #ifdef BENCHMARK_HAS_SYSCTL
+ int num_cpu = -1;
+ if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu;
+- fprintf(stderr, "Err: %s\n", strerror(errno));
+- std::exit(EXIT_FAILURE);
++ PrintErrorAndDie("Err: ", strerror(errno));
+ #elif defined(BENCHMARK_OS_WINDOWS)
+ SYSTEM_INFO sysinfo;
+ // Use memset as opposed to = {} to avoid GCC missing initializer false
+@@ -493,8 +492,8 @@ int GetNumCPUs() {
+ // Returns -1 in case of a failure.
+ long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+ if (num_cpu < 0) {
+- fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
+- strerror(errno));
++ PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
++ strerror(errno));
+ }
+ return (int)num_cpu;
+ #elif defined(BENCHMARK_OS_QNX)
+@@ -510,8 +509,7 @@ int GetNumCPUs() {
+ int max_id = -1;
+ std::ifstream f("/proc/cpuinfo");
+ if (!f.is_open()) {
+- std::cerr << "failed to open /proc/cpuinfo\n";
+- return -1;
++ PrintErrorAndDie("Failed to open /proc/cpuinfo");
+ }
+ #if defined(__alpha__)
+ const std::string Key = "cpus detected";
+@@ -540,12 +538,10 @@ int GetNumCPUs() {
+ }
+ }
+ if (f.bad()) {
+- std::cerr << "Failure reading /proc/cpuinfo\n";
+- return -1;
++ PrintErrorAndDie("Failure reading /proc/cpuinfo");
+ }
+ if (!f.eof()) {
+- std::cerr << "Failed to read to end of /proc/cpuinfo\n";
+- return -1;
++ PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
+ }
+ f.close();
+
+@@ -559,6 +555,16 @@ int GetNumCPUs() {
+ BENCHMARK_UNREACHABLE();
+ }
+
++int GetNumCPUs() {
++ const int num_cpus = GetNumCPUsImpl();
++ if (num_cpus < 1) {
++ PrintErrorAndDie(
++ "Unable to extract number of CPUs. If your platform uses "
++ "/proc/cpuinfo, custom support may need to be added.");
++ }
++ return num_cpus;
++}
++
+ class ThreadAffinityGuard final {
+ public:
+ ThreadAffinityGuard() : reset_affinity(SetAffinity()) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/
@ 2024-08-28 6:39 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-08-28 6:39 UTC (permalink / raw
To: gentoo-commits
commit: 84a975f3b739f65c2afb509cc6404fac53ee99c7
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
AuthorDate: Tue Aug 20 07:15:57 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 06:15:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a975f3
dev-cpp/benchmark: drop 1.8.3-r1
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38215
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-cpp/benchmark/Manifest | 1 -
dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild | 39 ---------
.../files/benchmark-1.8.3-backport-pr1753.patch | 94 ----------------------
.../files/benchmark-1.8.3-backport-pr1756.patch | 89 --------------------
.../files/benchmark-1.8.3-fix-32bit-test.patch | 20 -----
5 files changed, 243 deletions(-)
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 740a8c91715c..9fa403401fa5 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1,2 @@
-DIST benchmark-1.8.3.tar.gz 250206 BLAKE2B 14b4af17184a88378314d11623b73c27368999fcff6e50986407a08739fdf388cdcbd140471b629cd2a9948f81073796f8a6c38d015be8413b7e4d4759715f97 SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c
DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
deleted file mode 100644
index 8e3db7fe1c4a..000000000000
--- a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )
- test? ( >=dev-cpp/gtest-1.11.0 )"
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch"
- "${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch"
- "${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- -DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
- -DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_WERROR=OFF
- -DBENCHMARK_USE_BUNDLED_GTEST=OFF
- )
-
- use debug || append-cppflags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
deleted file mode 100644
index 1c2516c38e37..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1753
-
-From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:38:11 -0500
-Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture
-
-As documented, the real cycle counter is unsafe to use here, because it
-is a 32-bit integer which wraps every ~4s. Use gettimeofday instead,
-which has a limitation of a low-precision real-time-clock (~1ms), but no
-wrapping. Passes test suite.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/cycleclock.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index 931bba146..eff563e7f 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
- uint64_t pcycle;
- asm volatile("%0 = C15:14" : "=r"(pcycle));
- return static_cast<double>(pcycle);
-+#elif defined(__alpha__)
-+ // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit
-+ // integer and thus wraps every ~4s, making using it for tick counts
-+ // unreliable beyond this time range. The real-time clock is low-precision,
-+ // roughtly ~1ms, but it is the only option that can reasonable count
-+ // indefinitely.
-+ struct timeval tv;
-+ gettimeofday(&tv, nullptr);
-+ return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
- #else
- // The soft failover to a generic implementation is automatic only for ARM.
- // For other platforms the developer is expected to make an attempt to create
-
-From b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:46:06 -0500
-Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha
-
-And also, bail out if unable to parse /proc/cpuinfo. This will
-preemptively alert users on platforms that need custom code for parsing
-/proc/cpuinfo.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 04d64dc5b..786bb1b41 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -513,7 +513,11 @@ int GetNumCPUs() {
- std::cerr << "failed to open /proc/cpuinfo\n";
- return -1;
- }
-+#if defined(__alpha__)
-+ const std::string Key = "cpus detected";
-+#else
- const std::string Key = "processor";
-+#endif
- std::string ln;
- while (std::getline(f, ln)) {
- if (ln.empty()) continue;
-
-From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:49:24 -0500
-Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- test/user_counters_tabular_test.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc
-index 3e8fb1bf0..ffd3c0992 100644
---- a/test/user_counters_tabular_test.cc
-+++ b/test/user_counters_tabular_test.cc
-@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header,"
-
- void BM_Counters_Tabular(benchmark::State& state) {
- for (auto _ : state) {
-+ // This test requires a non-zero CPU time to avoid divide-by-zero
-+ auto iterations = state.iterations();
-+ benchmark::DoNotOptimize(iterations);
- }
- namespace bm = benchmark;
- state.counters.insert({
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
deleted file mode 100644
index 6744d3cf212f..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1756
-
-From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 13 Feb 2024 20:23:20 -0500
-Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure
-
-Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs
-never returns fewer than one CPU. There is no reasonable way to
-continue if we are unable to identify the number of CPUs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 786bb1b41..daeb98b02 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -474,12 +474,11 @@ std::string GetSystemName() {
- #endif // Catch-all POSIX block.
- }
-
--int GetNumCPUs() {
-+int GetNumCPUsImpl() {
- #ifdef BENCHMARK_HAS_SYSCTL
- int num_cpu = -1;
- if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu;
-- fprintf(stderr, "Err: %s\n", strerror(errno));
-- std::exit(EXIT_FAILURE);
-+ PrintErrorAndDie("Err: ", strerror(errno));
- #elif defined(BENCHMARK_OS_WINDOWS)
- SYSTEM_INFO sysinfo;
- // Use memset as opposed to = {} to avoid GCC missing initializer false
-@@ -493,8 +492,8 @@ int GetNumCPUs() {
- // Returns -1 in case of a failure.
- long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
- if (num_cpu < 0) {
-- fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
-- strerror(errno));
-+ PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
-+ strerror(errno));
- }
- return (int)num_cpu;
- #elif defined(BENCHMARK_OS_QNX)
-@@ -510,8 +509,7 @@ int GetNumCPUs() {
- int max_id = -1;
- std::ifstream f("/proc/cpuinfo");
- if (!f.is_open()) {
-- std::cerr << "failed to open /proc/cpuinfo\n";
-- return -1;
-+ PrintErrorAndDie("Failed to open /proc/cpuinfo");
- }
- #if defined(__alpha__)
- const std::string Key = "cpus detected";
-@@ -540,12 +538,10 @@ int GetNumCPUs() {
- }
- }
- if (f.bad()) {
-- std::cerr << "Failure reading /proc/cpuinfo\n";
-- return -1;
-+ PrintErrorAndDie("Failure reading /proc/cpuinfo");
- }
- if (!f.eof()) {
-- std::cerr << "Failed to read to end of /proc/cpuinfo\n";
-- return -1;
-+ PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
- }
- f.close();
-
-@@ -559,6 +555,16 @@ int GetNumCPUs() {
- BENCHMARK_UNREACHABLE();
- }
-
-+int GetNumCPUs() {
-+ const int num_cpus = GetNumCPUsImpl();
-+ if (num_cpus < 1) {
-+ PrintErrorAndDie(
-+ "Unable to extract number of CPUs. If your platform uses "
-+ "/proc/cpuinfo, custom support may need to be added.");
-+ }
-+ return num_cpus;
-+}
-+
- class ThreadAffinityGuard final {
- public:
- ThreadAffinityGuard() : reset_affinity(SetAffinity()) {
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
deleted file mode 100644
index 62e741687f9c..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/916278
-https://salsa.debian.org/science-team/benchmark/-/blob/master/debian/patches/0007-fix-32bit-test.patch?ref_type=heads
-
-Description: Fix 32bit-test
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2023-10-17
-
---- benchmark-1.8.3.orig/test/statistics_gtest.cc
-+++ benchmark-1.8.3/test/statistics_gtest.cc
-@@ -28,8 +28,8 @@ TEST(StatisticsTest, StdDev) {
- TEST(StatisticsTest, CV) {
- EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({101, 101, 101, 101}), 0.0);
- EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({1, 2, 3}), 1. / 2.);
-- EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
-- 0.32888184094918121);
-+ EXPECT_NEAR(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
-+ 0.32888184094918121, 1e-7);
- }
-
- } // end namespace
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-28 6:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-11 17:47 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2021-05-12 10:53 Marek Szuba
2021-08-13 16:31 Marek Szuba
2022-03-01 16:47 Marek Szuba
2024-03-21 2:41 Sam James
2024-08-28 6:39 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox