* [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/
@ 2021-12-20 4:19 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2021-12-20 4:19 UTC (permalink / raw
To: gentoo-commits
commit: 463aa8be2d7639642d95f825b52da4ca6badb6db
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 04:04:04 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 04:18:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463aa8be
dev-util/bear: add libtool test dep and gcc11 patch
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-util/bear/bear-3.0.17.ebuild | 3 ++
dev-util/bear/files/3.0.17-gcc11.patch | 52 ++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
index 94cca1494941..a4051dc0e04c 100644
--- a/dev-util/bear/bear-3.0.17.ebuild
+++ b/dev-util/bear/bear-3.0.17.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="test? (
+ sys-devel/libtool
$(python_gen_any_dep '
dev-python/lit[${PYTHON_USEDEP}]
')
@@ -41,6 +42,8 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${P^}"
+PATCHES=( "${FILESDIR}/3.0.17-gcc11.patch" )
+
pkg_setup() {
use test && python-any-r1_pkg_setup
}
diff --git a/dev-util/bear/files/3.0.17-gcc11.patch b/dev-util/bear/files/3.0.17-gcc11.patch
new file mode 100644
index 000000000000..cb52a7f36215
--- /dev/null
+++ b/dev-util/bear/files/3.0.17-gcc11.patch
@@ -0,0 +1,52 @@
+From ada467c3f4038abc3c3ac964a46ec0da0e8ed1c5 Mon Sep 17 00:00:00 2001
+From: shrkamat <shrinivas.kamath@gmail.com>
+Date: Sat, 11 Dec 2021 17:43:10 +0530
+Subject: [PATCH] Fix compile errors with g++ 11.02 (#434)
+
+Co-authored-by: Shrinivas Kamath <skamath@synamedia.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/libflags/include/libflags/Flags.h | 1 +
+ third_party/grpc/CMakeLists.txt | 5 +++++
+ 3 files changed, 7 insertions(+)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 7a4dc8f4..0ec003ee 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -27,6 +27,7 @@
+ #include <map>
+ #include <optional>
+ #include <string>
++#include <optional>
+
+ #include <fmt/format.h>
+
+diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
+index 76f772df..d92fbae2 100644
+--- a/source/libflags/include/libflags/Flags.h
++++ b/source/libflags/include/libflags/Flags.h
+@@ -28,6 +28,7 @@
+ #include <string_view>
+ #include <vector>
+ #include <iosfwd>
++#include <optional>
+
+ namespace flags {
+
+diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt
+index c8a7114b..792a0c6a 100644
+--- a/third_party/grpc/CMakeLists.txt
++++ b/third_party/grpc/CMakeLists.txt
+@@ -46,6 +46,11 @@ else ()
+ -DgRPC_BUILD_TESTS:BOOL=OFF
+ -DgRPC_BUILD_CSHARP_EXT:BOOL=OFF
+ -DCMAKE_INSTALL_PREFIX:PATH=${DEPENDENCIES_INSTALL_PREFIX}/grpc_dependency
++ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
++ -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
++ -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
++ -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
++ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
+ )
+
+ include(GNUInstallDirs)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/
@ 2022-10-28 18:50 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-10-28 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 4faf550baa77bca59e097840348eec4767827297
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:52:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:47:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4faf550b
dev-util/bear: drop 3.0.17
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/bear/Manifest | 1 -
dev-util/bear/bear-3.0.17.ebuild | 90 ----------------------------------
dev-util/bear/files/3.0.17-gcc11.patch | 52 --------------------
3 files changed, 143 deletions(-)
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 75749bfbe8ca..c654704a0b5f 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,3 +1,2 @@
DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
-DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
deleted file mode 100644
index b31cd181b486..000000000000
--- a/dev-util/bear/bear-3.0.17.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-cpp/nlohmann_json-3.7:=
- >=dev-db/sqlite-3.14:=
- <dev-libs/libfmt-9.0.0:=
- dev-libs/protobuf:=
- >=dev-libs/spdlog-1.5
- >=net-libs/grpc-1.26:=
-"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gtest-1.10
- )
-"
-
-BDEPEND="test? (
- sys-devel/libtool
- $(python_gen_any_dep '
- dev-python/lit[${PYTHON_USEDEP}]
- ')
-)"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=( "${FILESDIR}/3.0.17-gcc11.patch" )
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Turn off testing before installation
- sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_UNIT_TESTS="$(usex test ON OFF)"
- -DENABLE_FUNC_TESTS="$(usex test ON OFF)"
- )
- cmake_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "\'FEATURES=sandbox\' detected"
- ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
- ewarn "Skipping tests"
- elif
- has usersandbox ${FEATURES}; then
- ewarn "\'FEATURES=usersandbox\' detected"
- ewarn "Skipping tests"
- elif
- has network-sandbox ${FEATURES}; then
- ewarn "\'FEATURES=network-sandbox\' detected"
- ewarn "Skipping tests"
- elif
- has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
- ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
- ewarn "and will fail without generic cc symlink"
- ewarn "Skipping tests"
- else
- einfo "test may use optional tools if found: qmake gfortran valgrind"
- # unit tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
- # functional tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
- fi
-}
diff --git a/dev-util/bear/files/3.0.17-gcc11.patch b/dev-util/bear/files/3.0.17-gcc11.patch
deleted file mode 100644
index cb52a7f36215..000000000000
--- a/dev-util/bear/files/3.0.17-gcc11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ada467c3f4038abc3c3ac964a46ec0da0e8ed1c5 Mon Sep 17 00:00:00 2001
-From: shrkamat <shrinivas.kamath@gmail.com>
-Date: Sat, 11 Dec 2021 17:43:10 +0530
-Subject: [PATCH] Fix compile errors with g++ 11.02 (#434)
-
-Co-authored-by: Shrinivas Kamath <skamath@synamedia.com>
----
- source/citnames/source/semantic/Parsers.h | 1 +
- source/libflags/include/libflags/Flags.h | 1 +
- third_party/grpc/CMakeLists.txt | 5 +++++
- 3 files changed, 7 insertions(+)
-
-diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
-index 7a4dc8f4..0ec003ee 100644
---- a/source/citnames/source/semantic/Parsers.h
-+++ b/source/citnames/source/semantic/Parsers.h
-@@ -27,6 +27,7 @@
- #include <map>
- #include <optional>
- #include <string>
-+#include <optional>
-
- #include <fmt/format.h>
-
-diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
-index 76f772df..d92fbae2 100644
---- a/source/libflags/include/libflags/Flags.h
-+++ b/source/libflags/include/libflags/Flags.h
-@@ -28,6 +28,7 @@
- #include <string_view>
- #include <vector>
- #include <iosfwd>
-+#include <optional>
-
- namespace flags {
-
-diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt
-index c8a7114b..792a0c6a 100644
---- a/third_party/grpc/CMakeLists.txt
-+++ b/third_party/grpc/CMakeLists.txt
-@@ -46,6 +46,11 @@ else ()
- -DgRPC_BUILD_TESTS:BOOL=OFF
- -DgRPC_BUILD_CSHARP_EXT:BOOL=OFF
- -DCMAKE_INSTALL_PREFIX:PATH=${DEPENDENCIES_INSTALL_PREFIX}/grpc_dependency
-+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-+ -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
-+ -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
-+ -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
- )
-
- include(GNUInstallDirs)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/
@ 2024-07-03 5:30 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-07-03 5:30 UTC (permalink / raw
To: gentoo-commits
commit: f3c5adab6c67daf989716abaa1b716f1458e2e40
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat May 25 15:37:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 05:30:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c5adab
dev-util/bear: drop 3.0.20-r1, 3.0.21, 3.1.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-util/bear/Manifest | 3 -
dev-util/bear/bear-3.0.20-r1.ebuild | 91 --------------------
dev-util/bear/bear-3.0.21.ebuild | 96 ----------------------
dev-util/bear/bear-3.1.2.ebuild | 95 ---------------------
.../bear/files/bear-3.0.21-clang16-tests.patch | 32 --------
.../bear/files/bear-3.0.21-libfmt-10.0.0.patch | 26 ------
6 files changed, 343 deletions(-)
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 9425105b679e..7f7b17831dbd 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,4 +1 @@
-DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
-DIST bear-3.0.21.tar.gz 125827 BLAKE2B f7dcd383f27c370edb2fa0225e8337b2abe086df25a0272f61051600c017527b4079750328cb811b6967ad6fab51647909333eb1d084e24060fe56ca1036e40d SHA512 9fe43a52fb30b7b413244576c6ea0d493bb720e54d0b6263280224efef4b0432dee46697df160ba7e76bc1a5c8735fe814e0eb686ed797658b563bcb8c5bb7e5
-DIST bear-3.1.2.tar.gz 127197 BLAKE2B b9ef373aab194f0e7330c5f457b88e3c11bb3b202940eff65ecbae79b123254df9629c06f4781570b19675834be80fba041b070820663a6b9a747fc6d269be25 SHA512 02701e8a53b9d776ca838248f5b5d149d7ded6e024ce65bd1ca3b440ab1bf95691dc3d36bb28f043ce24bc1da6e666fb022ff92fa9df7c3142451742de16ca3e
DIST bear-3.1.3.tar.gz 127766 BLAKE2B 8fdb5b9bf8e1e026df2296b0d45f23ce1a9157dda28b2656d36c0799e2f02965711ecdf09780d075e18965afc6a771dbf26501e9e1e3b26f4784d4191e168748 SHA512 34039b51a7cd636bdb7fb716f69d6c70de3e7bfc5e2c83a3040942010fb7effe49b0afa0d29be182eb550d57b024fbe5bea779a7fda5f86201865bf491ba1672
diff --git a/dev-util/bear/bear-3.0.20-r1.ebuild b/dev-util/bear/bear-3.0.20-r1.ebuild
deleted file mode 100644
index 05332355b211..000000000000
--- a/dev-util/bear/bear-3.0.20-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-cpp/nlohmann_json-3.7.3:=
- >=dev-db/sqlite-3.14:=
- dev-libs/libfmt:=
- dev-libs/protobuf:=
- >=dev-libs/spdlog-1.5:=
- >=net-libs/grpc-1.26:=
-"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gtest-1.10
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-build/libtool
- $(python_gen_any_dep '
- dev-python/lit[${PYTHON_USEDEP}]
- ')
- )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Turn off testing before installation
- sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_UNIT_TESTS="$(usex test)"
- -DENABLE_FUNC_TESTS="$(usex test)"
- )
- cmake_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "\'FEATURES=sandbox\' detected"
- ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
- ewarn "Skipping tests"
- elif
- has usersandbox ${FEATURES}; then
- ewarn "\'FEATURES=usersandbox\' detected"
- ewarn "Skipping tests"
- elif
- has network-sandbox ${FEATURES}; then
- ewarn "\'FEATURES=network-sandbox\' detected"
- ewarn "Skipping tests"
- elif
- has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
- ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
- ewarn "and will fail without generic cc symlink"
- ewarn "Skipping tests"
- else
- einfo "test may use optional tools if found: qmake gfortran valgrind"
- # unit tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
- # functional tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
- fi
-}
diff --git a/dev-util/bear/bear-3.0.21.ebuild b/dev-util/bear/bear-3.0.21.ebuild
deleted file mode 100644
index 3dbde5dce6df..000000000000
--- a/dev-util/bear/bear-3.0.21.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-cpp/nlohmann_json-3.11.2:=
- >=dev-db/sqlite-3.14:=
- >=dev-libs/libfmt-9.1.0:=
- dev-libs/protobuf:=
- >=dev-libs/spdlog-1.11.0:=
- >=net-libs/grpc-1.49.2:=
-"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gtest-1.10
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-build/libtool
- $(python_gen_any_dep '
- dev-python/lit[${PYTHON_USEDEP}]
- ')
- )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.21-clang16-tests.patch
- "${FILESDIR}"/${PN}-3.0.21-libfmt-10.0.0.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Turn off testing before installation
- sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_UNIT_TESTS="$(usex test)"
- -DENABLE_FUNC_TESTS="$(usex test)"
- )
- cmake_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "\'FEATURES=sandbox\' detected"
- ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
- ewarn "Skipping tests"
- elif
- has usersandbox ${FEATURES}; then
- ewarn "\'FEATURES=usersandbox\' detected"
- ewarn "Skipping tests"
- elif
- has network-sandbox ${FEATURES}; then
- ewarn "\'FEATURES=network-sandbox\' detected"
- ewarn "Skipping tests"
- elif
- has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
- ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
- ewarn "and will fail without generic cc symlink"
- ewarn "Skipping tests"
- else
- einfo "test may use optional tools if found: qmake gfortran valgrind"
- # unit tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
- # functional tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
- fi
-}
diff --git a/dev-util/bear/bear-3.1.2.ebuild b/dev-util/bear/bear-3.1.2.ebuild
deleted file mode 100644
index 9c75a5f7010e..000000000000
--- a/dev-util/bear/bear-3.1.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-cpp/nlohmann_json-3.11.2:=
- >=dev-db/sqlite-3.14:=
- >=dev-libs/libfmt-9.1.0:=
- dev-libs/protobuf:=
- >=dev-libs/spdlog-1.11.0:=
- >=net-libs/grpc-1.49.2:=
-"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gtest-1.13
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-build/libtool
- $(python_gen_any_dep '
- dev-python/lit[${PYTHON_USEDEP}]
- ')
- )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.21-libfmt-10.0.0.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Turn off testing before installation
- sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_UNIT_TESTS="$(usex test)"
- -DENABLE_FUNC_TESTS="$(usex test)"
- )
- cmake_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "\'FEATURES=sandbox\' detected"
- ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
- ewarn "Skipping tests"
- elif
- has usersandbox ${FEATURES}; then
- ewarn "\'FEATURES=usersandbox\' detected"
- ewarn "Skipping tests"
- elif
- has network-sandbox ${FEATURES}; then
- ewarn "\'FEATURES=network-sandbox\' detected"
- ewarn "Skipping tests"
- elif
- has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
- ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
- ewarn "and will fail without generic cc symlink"
- ewarn "Skipping tests"
- else
- einfo "test may use optional tools if found: qmake gfortran valgrind"
- # unit tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
- # functional tests
- cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
- fi
-}
diff --git a/dev-util/bear/files/bear-3.0.21-clang16-tests.patch b/dev-util/bear/files/bear-3.0.21-clang16-tests.patch
deleted file mode 100644
index 19c63ba60849..000000000000
--- a/dev-util/bear/files/bear-3.0.21-clang16-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/rizsotto/Bear/pull/521
-
-From 472cbed312444cdcef9102e924c79070ea1d3ab2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Sat, 15 Apr 2023 19:37:41 +0200
-Subject: [PATCH] Avoid implicit function declarations in tests, for C99
- compatibility
-
-Include <stdio.h> for printf and define _GNU_SOURCE for execvpe.
-
-Future compilers will not support implicit function declartions by
-default, causing these tests to fail to build.
---- a/test/cases/intercept/preload/errno_reset.c
-+++ b/test/cases/intercept/preload/errno_reset.c
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <stdio.h>
-
- int main()
- {
---- a/test/cases/intercept/preload/posix/execvpe/success.c
-+++ b/test/cases/intercept/preload/posix/execvpe/success.c
-@@ -8,6 +8,7 @@
- #include "config.h"
-
- #if defined HAVE_UNISTD_H
-+#define _GNU_SOURCE
- #include <unistd.h>
- #endif
-
diff --git a/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch b/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch
deleted file mode 100644
index 7c8425e46ede..000000000000
--- a/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-BUG: https://bugs.gentoo.org/906082
-UPSTREAM: https://github.com/rizsotto/Bear/pull/526
-
-From 46a032fa0fc8131779ece13f26735ec84be891e8 Mon Sep 17 00:00:00 2001
-From: jinqiang zhang <peeweep@0x0.ee>
-Date: Thu, 11 May 2023 03:33:17 +0800
-Subject: [PATCH] dependency: fix fmt 10.0.0 incompatibilities (#526)
-
-Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
----
- source/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 6da1131f..fe6b710b 100644
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -29,7 +29,7 @@ find_package(spdlog REQUIRED)
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
-
--if (fmt_VERSION_MAJOR EQUAL 9)
-+if (fmt_VERSION_MAJOR GREATER_EQUAL 9)
- set(FMT_NEEDS_OSTREAM_FORMATTER 1)
- set(HAVE_FMT_STD_H 1) # FIXME: this should be done with `check_include_file`
- endif ()
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/
@ 2024-08-13 13:05 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-08-13 13:05 UTC (permalink / raw
To: gentoo-commits
commit: cdbb1f6f8bca88322e6c68fa7fc142122cd77a16
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Aug 6 10:52:37 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 13:03:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbb1f6f
dev-util/bear: 3.1.4-r1 reduce gRPC verbosity to fix bear::func_test
Closes: https://bugs.gentoo.org/935788
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37992
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-util/bear/bear-3.1.4-r1.ebuild | 1 +
.../files/bear-3.1.4-reduce-grpc-verbosity.patch | 41 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/dev-util/bear/bear-3.1.4-r1.ebuild b/dev-util/bear/bear-3.1.4-r1.ebuild
index 4dfcf1c91fa8..b3a0ae0c42c0 100644
--- a/dev-util/bear/bear-3.1.4-r1.ebuild
+++ b/dev-util/bear/bear-3.1.4-r1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-3.1.4-tests.patch"
+ "${FILESDIR}/${PN}-3.1.4-reduce-grpc-verbosity.patch"
)
pkg_setup() {
diff --git a/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch b/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch
new file mode 100644
index 000000000000..b54d1d4ccb54
--- /dev/null
+++ b/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch
@@ -0,0 +1,41 @@
+From fc09623adbf4581a50b1355c27a4df849ffb18c4 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 6 Aug 2024 12:03:17 +0200
+Subject: [PATCH] make gRPC less verbose in tests
+
+Bug: https://github.com/grpc/grpc/issues/37222
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ test/cases/intercept/preload/build_stderr_captured.sh | 2 +-
+ test/cases/intercept/wrapper/build_stderr_captured.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/cases/intercept/preload/build_stderr_captured.sh b/test/cases/intercept/preload/build_stderr_captured.sh
+index b7c7d97..47ea183 100644
+--- a/test/cases/intercept/preload/build_stderr_captured.sh
++++ b/test/cases/intercept/preload/build_stderr_captured.sh
+@@ -2,7 +2,7 @@
+
+ # REQUIRES: preload, shell, dynamic-shell
+ # RUN: %{shell} %s 2> %t.orig.stderr
+-# RUN: %{intercept} --output %t.json -- %{shell} %s 2> %t.fwd.stderr
++# RUN: env GRPC_VERBOSITY="ERROR" %{intercept} --output %t.json -- %{shell} %s 2> %t.fwd.stderr
+ # RUN: diff %t.orig.stderr %t.fwd.stderr
+
+ >&2 $ECHO "Lorem ipsum dolor sit amet, consectetur adipiscing elit,"
+diff --git a/test/cases/intercept/wrapper/build_stderr_captured.sh b/test/cases/intercept/wrapper/build_stderr_captured.sh
+index f99dbbc..4d2be8b 100644
+--- a/test/cases/intercept/wrapper/build_stderr_captured.sh
++++ b/test/cases/intercept/wrapper/build_stderr_captured.sh
+@@ -2,7 +2,7 @@
+
+ # REQUIRES: shell
+ # RUN: %{shell} %s 2> %t.orig.stderr
+-# RUN: %{intercept} --force-wrapper --output %t.json -- %{shell} %s 2> %t.fwd.stderr
++# RUN: env GRPC_VERBOSITY="ERROR" %{intercept} --force-wrapper --output %t.json -- %{shell} %s 2> %t.fwd.stderr
+ # RUN: diff %t.orig.stderr %t.fwd.stderr
+
+ >&2 $ECHO "Lorem ipsum dolor sit amet, consectetur adipiscing elit,"
+--
+2.45.2
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-13 13:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-13 13:05 [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-07-03 5:30 Joonas Niilola
2022-10-28 18:50 Sam James
2021-12-20 4:19 Georgy Yakovlev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox