public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/bear] epel10: Update to 3.0.11 (RHBZ#1921884)
@ 2026-07-11 2:31 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-11 2:31 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/bear
Branch : epel10
Commit : 8a5d8afe5b039d20b9be57f4a284e145905d7776
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2021-05-13T08:22:37-04:00
Stats : +82/-77 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/bear/c/8a5d8afe5b039d20b9be57f4a284e145905d7776?branch=epel10
Log:
Update to 3.0.11 (RHBZ#1921884)
- Drop bear.missing-includes.patch, which was upstreamed
- Rebase bear.libexec-subdir.patch from PR#348 as actually merged
upstream
- Disable LTO to work around RHBZ#1959600
---
diff --git a/.gitignore b/.gitignore
index ba94266..c8cde6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/bear-2.4.4.tar.gz
/bear-3.0.6.tar.gz
/bear-3.0.7.tar.gz
+/bear-3.0.11.tar.gz
diff --git a/bear.libexec-subdir.patch b/bear.libexec-subdir.patch
index cc52506..40a09b5 100644
--- a/bear.libexec-subdir.patch
+++ b/bear.libexec-subdir.patch
@@ -1,83 +1,104 @@
-commit b48ca5d90c129d26702e458f7ad9ba65d7585f2a
-Author: Till Hofmann <thofmann@fedoraproject.org>
-Date: Wed Dec 30 13:27:10 2020 +0100
-
- Install files into /usr/libexec/bear instead of directly into /usr/libexec
-
- As the installed files have rather generic names (e.g., libexec.so), put them
- into a sub-directory so it is clear that those files belong to bear.
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a71eca..1820787 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,6 +33,8 @@ if (NOT CMAKE_INSTALL_LIBEXECDIR)
+ include(GNUInstallDirs)
+ endif ()
+
++set(PRIVATE_INSTALLDIR "${CMAKE_INSTALL_LIBEXECDIR}/bear" CACHE PATH "Install directory for private binaries")
++
+ # Verify or install dependencies
+ add_subdirectory(third_party)
+
+@@ -58,6 +60,7 @@ ExternalProject_Add(BearSource
+ -DCMAKE_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
+ -DCMAKE_INSTALL_LIBEXECDIR:PATH=${CMAKE_INSTALL_LIBEXECDIR}
+ -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
++ -DPRIVATE_INSTALLDIR:PATH=${PRIVATE_INSTALLDIR}
+ -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+ -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
+ -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS}
+@@ -77,6 +80,7 @@ if (ENABLE_FUNC_TESTS)
+ CMAKE_CACHE_ARGS
+ -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
+ -DBEARSOURCE_BUILD_DIR:PATH=${CMAKE_BINARY_DIR}/subprojects/Build/BearSource
++ -DPRIVATE_INSTALLDIR:PATH=${PRIVATE_INSTALLDIR}
+ TEST_BEFORE_INSTALL
+ 1
+ INSTALL_COMMAND
diff --git a/source/config.h.in b/source/config.h.in
-index 2ca8853..48370fd 100644
+index 348ec92..ffcce3a 100644
--- a/source/config.h.in
+++ b/source/config.h.in
-@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@";
+@@ -107,8 +107,8 @@ namespace cmd {
+ }
+
+ namespace wrapper {
+- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper";
+- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
++ constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper";
++ constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d";
+
+ constexpr char FLAG_VERBOSE[] = "--verbose";
+ constexpr char FLAG_DESTINATION[] = "--destination";
+@@ -120,7 +120,7 @@ namespace cmd {
+ }
+
+ namespace library {
+- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
++ constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
- constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames";
- constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept";
--constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
--constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er";
--constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
-+constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
-+constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/er";
-+constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/wrapper.d";
+ constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";
+ constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";
diff --git a/source/intercept/CMakeLists.txt b/source/intercept/CMakeLists.txt
-index f3ca535..5b2962f 100644
+index 142080e..73fef86 100644
--- a/source/intercept/CMakeLists.txt
+++ b/source/intercept/CMakeLists.txt
-@@ -111,9 +111,9 @@ target_link_libraries(wrapper rpc_a)
- target_link_libraries(wrapper spdlog::spdlog)
+@@ -106,9 +106,9 @@ target_link_libraries(wrapper
+ wrapper_a)
install(TARGETS wrapper
- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
++ RUNTIME DESTINATION ${PRIVATE_INSTALLDIR})
install(DIRECTORY
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d)
-+ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d)
++ DESTINATION ${PRIVATE_INSTALLDIR}/wrapper.d)
install(CODE "
execute_process(
COMMAND ln -sf ../wrapper ar
-@@ -145,7 +145,7 @@ install(CODE "
+@@ -142,7 +142,7 @@ install(CODE "
COMMAND ln -sf ../wrapper objdump
COMMAND ln -sf ../wrapper ranlib
COMMAND ln -sf ../wrapper readelf
- WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d
-+ WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d
++ WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${PRIVATE_INSTALLDIR}/wrapper.d
)
")
-@@ -164,7 +164,7 @@ target_link_libraries(er rpc_a)
- target_link_libraries(er spdlog::spdlog)
-
- install(TARGETS er
-- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
-
- add_library(exec_a OBJECT
- source/report/libexec/Buffer.cc
-@@ -206,7 +206,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+@@ -187,7 +187,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
endif ()
install(TARGETS exec
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
++ LIBRARY DESTINATION ${PRIVATE_INSTALLDIR})
+
# Create unit test.
- if (ENABLE_UNIT_TESTS)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 97ec800..0d136b2 100644
+index e2d5d52..d73a106 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -53,9 +53,9 @@ if (LIT_EXECUTABLE)
-D_BIN_BEAR=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/bear
-D_BIN_CITNAMES=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/citnames
-D_BIN_INTERCEPT=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/intercept
-- -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/er
+- -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/wrapper
- -D_BIN_WRAPPER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d
- -D_LIB_EXEC=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}exec${CMAKE_SHARED_LIBRARY_SUFFIX}
-+ -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/er
-+ -D_BIN_WRAPPER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d
-+ -D_LIB_EXEC=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/${CMAKE_SHARED_LIBRARY_PREFIX}exec${CMAKE_SHARED_LIBRARY_SUFFIX}
++ -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${PRIVATE_INSTALLDIR}/wrapper
++ -D_BIN_WRAPPER=${STAGED_INSTALL_PREFIX}/${PRIVATE_INSTALLDIR}/wrapper.d
++ -D_LIB_EXEC=${STAGED_INSTALL_PREFIX}/${PRIVATE_INSTALLDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}exec${CMAKE_SHARED_LIBRARY_SUFFIX}
+ -D_BIN_EVENTS_DB=${BEARSOURCE_BUILD_DIR}/intercept/events_db
-v
${CMAKE_CURRENT_BINARY_DIR})
-
diff --git a/bear.missing-includes.patch b/bear.missing-includes.patch
deleted file mode 100644
index 878a423..0000000
--- a/bear.missing-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
-index f9c9f93..5fbbd64 100644
---- a/source/libflags/include/libflags/Flags.h
-+++ b/source/libflags/include/libflags/Flags.h
-@@ -21,6 +21,7 @@
-
- #include <list>
- #include <map>
-+#include <optional>
- #include <string_view>
- #include <tuple>
- #include <vector>
-diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
-index 8868bd5..7c48bd2 100644
---- a/source/citnames/source/semantic/Parsers.h
-+++ b/source/citnames/source/semantic/Parsers.h
-@@ -25,6 +25,7 @@
- #include <cstdint>
- #include <list>
- #include <map>
-+#include <optional>
- #include <string>
-
- #include <spdlog/spdlog.h>
diff --git a/bear.spec b/bear.spec
index 4ea2e4c..15683c0 100644
--- a/bear.spec
+++ b/bear.spec
@@ -1,12 +1,12 @@
Name: bear
-Version: 3.0.7
-Release: 2%{?dist}
+Version: 3.0.11
+Release: 1%{?dist}
Summary: Tool that generates a compilation database for clang tooling
License: GPLv3+
URL: https://github.com/rizsotto/%{name}
Source: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0: bear.missing-includes.patch
+
# https://github.com/rizsotto/Bear/pull/348
Patch1: bear.libexec-subdir.patch
@@ -21,12 +21,16 @@ BuildRequires: gmock-devel
BuildRequires: grpc-plugins
BuildRequires: make
BuildRequires: pkgconfig(grpc)
-BuildRequires: pkgconfig(sqlite3)
BuildRequires: python3
# Needed for (disabled) functional tests
#BuildRequires: python3dist(lit)
+# Work around RHBZ#1959600 (https://github.com/rizsotto/Bear/issues/309), which
+# caused a test failure on s390x. It may only be happenstance that no other
+# architectures were affected.
+%global _lto_cflags %{nil}
+
%description
Build ear produces compilation database in JSON format. This database describes
how single compilation unit should be processed and can be used by Clang
@@ -55,10 +59,7 @@ mv %{buildroot}/%{_docdir}/Bear %{buildroot}/%{_docdir}/bear
%{_bindir}/bear
%{_bindir}/citnames
%{_bindir}/intercept
-%{_libexecdir}/bear/er
-%{_libexecdir}/bear/libexec.so
-%{_libexecdir}/bear/wrapper
-%{_libexecdir}/bear/wrapper.d
+%{_libexecdir}/bear
%{_mandir}/man1/bear.1*
%{_mandir}/man1/citnames.1*
%{_mandir}/man1/intercept.1*
@@ -72,6 +73,12 @@ mv %{buildroot}/%{_docdir}/Bear %{buildroot}/%{_docdir}/bear
%doc %{_docdir}/bear
%changelog
+* Thu May 13 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 3.0.11-1
+- Update to 3.0.11 (RHBZ#1921884)
+- Drop bear.missing-includes.patch, which was upstreamed
+- Rebase bear.libexec-subdir.patch from PR#348 as actually merged upstream
+- Disable LTO to work around RHBZ#1959600
+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 5e8c77e..76c9cc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bear-3.0.7.tar.gz) = fcde13bd56836c60d41930b38f62f2bba672553167a412bb13cf4f3906ca7fef77be291fe159e64597993807187e75d39eba4fb5c79a3cdd1d2f8c317bac458b
+SHA512 (bear-3.0.11.tar.gz) = 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-11 2:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-11 2:31 [rpms/bear] epel10: Update to 3.0.11 (RHBZ#1921884) Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox