From f7848a24b0e0541f77cdba1a7ccbe99a37e4ea11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 1 Mar 2021 20:28:53 -0300 Subject: [PATCH 1/2] grpc: add libressl-devel to grpc-devel. Noticed dependency was required when building new Bear. --- srcpkgs/grpc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index e915c4322b8..a2d328497b0 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.36.0 -revision=1 +revision=2 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON @@ -10,8 +10,8 @@ configure_args="-DBUILD_SHARED_LIBS=ON -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="which protobuf" -makedepends="zlib-devel c-ares-devel libressl-devel - libprotoc-devel protobuf-devel gperftools-devel re2-devel" +_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel" +makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}" short_desc="High performance, open source, general RPC framework" maintainer="Andrew J. Hesford " license="Apache-2.0" @@ -58,7 +58,7 @@ post_install() { grpc-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} c-ares-devel re2-devel zlib-devel" + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" pkg_install() { vmove usr/include vmove usr/lib/*.so From cacd333e020016453f51de2f27f8bbf8634c89f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 1 Mar 2021 20:23:11 -0300 Subject: [PATCH 2/2] Bear: update to 3.0.8. --- srcpkgs/Bear/template | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index b2d8cd33765..e0f64aeec75 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,14 +1,20 @@ # Template file for 'Bear' pkgname=Bear -version=2.4.3 +version=3.0.8 revision=1 build_style=cmake -hostmakedepends="python3" -depends="python3" +hostmakedepends="pkg-config protobuf grpc" +makedepends="grpc-devel protobuf-devel sqlite-devel fmt-devel + json-c++ spdlog" +checkdepends="gtest-devel" short_desc="Tool that generates a compilation database for clang tooling" maintainer="Alain Kalker " license="GPL-3.0-or-later" homepage="https://github.com/rizsotto/Bear" -changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md" -distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=74057678642080d193a9f65a804612e1d5b87da5a1f82ee487bbc44eb34993f2 +distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz" +checksum=663ef2fcf359e1efb20831fae3901a3edbbb906dd0bc5e62af92e353651c5cec + +# paths in gtest.pc for cross are broken +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args="-DENABLE_UNIT_TESTS=OFF -DENABLE_FUNC_TESTS=OFF" +fi