summaryrefslogtreecommitdiff
path: root/dev-util/bear
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/bear')
-rw-r--r--dev-util/bear/Manifest10
-rw-r--r--dev-util/bear/bear-3.0.20-r1.ebuild91
-rw-r--r--dev-util/bear/bear-3.1.2.ebuild95
-rw-r--r--dev-util/bear/bear-3.1.4.ebuild (renamed from dev-util/bear/bear-3.0.21.ebuild)25
-rw-r--r--dev-util/bear/files/bear-3.0.21-clang16-tests.patch32
-rw-r--r--dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch26
6 files changed, 13 insertions, 266 deletions
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 67551ee2d221..9444aa62d5cf 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,11 +1,5 @@
-AUX bear-3.0.21-clang16-tests.patch 911 BLAKE2B e9a11358b80604ef7a2e59e22bc5bde5740e31acfe5603fdf231f187f053f494c498bd0c169d70d658d2326803f0b102146c51ce475453f5780a2a35dc407ebe SHA512 558082dada367a4b8e95294ad57bada30c0e982551be248c3b08d610f81b653d75fe02c07cf1bb9321f2314893de4aced0cc97f16d276d4762874e7fdbfbd70f
-AUX bear-3.0.21-libfmt-10.0.0.patch 936 BLAKE2B 1ac889c2bfa057cc6b25fa473a88b05a66f02524134b3f10ee37c5c5fa662800523ae86ec3ec4197eb503944f782449bd65f107e23ff6f9529d4ceb886c508d6 SHA512 cef41aa6ef8ce580f4b12df5e883b477f67d6bed3b71a31aa7d9c2265d0e324bb669d05387b5401629e2bbe72fe4094a53a96a11bdf656fd833585567a748890
-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
-EBUILD bear-3.0.20-r1.ebuild 2131 BLAKE2B 1aec812443425c92fb59f0d0577d1a69a5b11a20aeff80a0c9be16660d067d30e99d2ddec6a1fc9738aceee2d07e9f9ea5acfc9bcb1327f97f6d50309e8f8eee SHA512 55b074325450e780083e83df432b00b4a1c0d0e266a8eb577631c63b597b95d15f388eb1490f24c858f06ceb7bf42acaba65d348e75f5639102c0dfd662a8163
-EBUILD bear-3.0.21.ebuild 2270 BLAKE2B 06cf82df439887d19c53d46a4242d72706e83d115df71b540feca6d906218dacc82a454242bbdceb0fa0ae61f7374428d9daf31785359bab490215b4c55ab00f SHA512 c309854352ecce0aadded0fad371fa29e57cb8b4142434e24c3b6b82d63525f089910ee6d4dc5615a33ee2882ef65f13792a2f8abf9c6167faae8cc6903b2790
-EBUILD bear-3.1.2.ebuild 2220 BLAKE2B 1c041c9b1b0c598ce28bbf61f57a383e27b68e1fcccb3cbf5a3efd38db18e5c796854e922281dd2a663a9d2c9123bd06d7c2ce4aa907d0d0d7e06c461e4fe3ea SHA512 978884017dd3ca1f806193b78007cde000f045643fa6741a9b20c1a795173e07c1cfb1b44ae43510b2746479a4219cc3a27e8b417f7027328e65c50994f12eb1
+DIST bear-3.1.4.tar.gz 127672 BLAKE2B 18deb1172fcd8afdf4721a04b5d72b182190afd92d645841023033d187c812a0a30805af2bfb67b794ab8a8f0ca42965bebab6d035e95e2a25c5fccfe48a1afd SHA512 c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98
EBUILD bear-3.1.3.ebuild 2294 BLAKE2B 567743514d620a381e558bc5f4f6af3d95bdcb16d5aa055002c9777fb349538a68a81bac5bbc95972f70b992aa3367df4ccd52ca6fbb849b4937f271a6b7fed2 SHA512 bfec90ac915f5af0a1d43239ea1234e407991a1841490630f988e12279147afe78316ca212ddf9eec864bd99ecda431169a0d52e24a70791ceb6a4b7fc3a011e
+EBUILD bear-3.1.4.ebuild 2294 BLAKE2B 931a5a1da0c5dabab6507e3f2ad2cb43d1f711358dbbd6772ac3b4d907715ebed380a8da34be723ace83d2e955792d03204ae0af05cf5dbe7d790f335c8473e4 SHA512 0da412c2b77dc6a3f6102046ca27e1a4151b85c8438c401d2f2ecae6427ddf34229298befb8459bb2056d7d8571287b1e8cc7f68c7119cc01ef65e080aa1d69a
MISC metadata.xml 1067 BLAKE2B 180de420c2173d245fa29b092d80e2c94ae2df8ba5c1c9d3fa2d706c75fbbc489d08b61505bf612fe247b7a9384b220682549f47db77b8bc3e7b170be9663380 SHA512 df9e220346c2098767bafc1e212a94fedae90892de64d8f04c599f3caf124d3ab539a9d9f757b5ba5ed4ff895fa39b954409d551514c9ee6fe44296c2317a021
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.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/bear-3.0.21.ebuild b/dev-util/bear/bear-3.1.4.ebuild
index 3dbde5dce6df..6abba52decd6 100644
--- a/dev-util/bear/bear-3.0.21.ebuild
+++ b/dev-util/bear/bear-3.1.4.ebuild
@@ -3,31 +3,34 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake python-any-r1
+inherit cmake multiprocessing 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"
+S="${WORKDIR}/${P^}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
+ dev-cpp/abseil-cpp:=
>=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}
+DEPEND="
+ ${RDEPEND}
test? (
- >=dev-cpp/gtest-1.10
+ >=dev-cpp/gtest-1.13
)
"
@@ -41,15 +44,6 @@ BDEPEND="
)
"
-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
}
@@ -61,6 +55,9 @@ src_prepare() {
}
src_configure() {
+ # TODO: remove this when https://bugs.gentoo.org/928346 is fixed
+ export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
+
local mycmakeargs=(
-DENABLE_UNIT_TESTS="$(usex test)"
-DENABLE_FUNC_TESTS="$(usex test)"
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 ()
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 10:57:56 +0000