[packages/glog] - updated to 0.7.1 (new soname, at least C++14 now)
qboosh
qboosh at pld-linux.org
Sat Feb 28 19:16:23 CET 2026
commit b8a07671e9688543fda80cf9115d42a6b508f570
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 28 19:16:21 2026 +0100
- updated to 0.7.1 (new soname, at least C++14 now)
avoid-inline-asm.patch | 57 --------------------------------------------------
glog.spec | 27 ++++++++++++------------
2 files changed, 14 insertions(+), 70 deletions(-)
---
diff --git a/glog.spec b/glog.spec
index f786294..40b51de 100644
--- a/glog.spec
+++ b/glog.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without libunwind # libunwind support
%bcond_without static_libs # static library
-%bcond_without tests # gtest/gmock based tests [recheck: signalhandler_unittest broken on x32 as of 0.4.0]
+%bcond_with tests # gtest/gmock based tests (signalhandler failed on x32 as of 0.4.0, logging,stackframe fail on x86)
%ifarch %{ix86} %{x8664} x32 %{arm} hppa ia64 mips ppc ppc64 sh
%undefine with_libunwind
@@ -10,18 +10,17 @@
Summary: A C++ application logging library
Summary(pl.UTF-8): Biblioteka do logowania dla aplikacji w C++
Name: glog
-Version: 0.6.0
-Release: 2
+Version: 0.7.1
+Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/google/glog/releases
Source0: https://github.com/google/glog/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: c98a6068bc9b8ad9cebaca625ca73aa2
-Patch0: avoid-inline-asm.patch
+# Source0-md5: 128e2995cc33d794ff24f785a3060346
URL: https://github.com/google/glog
-BuildRequires: cmake >= 3.16
+BuildRequires: cmake >= 3.22
BuildRequires: gflags-devel >= 2.2.2
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:5
%if %{with libunwind}
BuildRequires: libunwind-devel
%endif
@@ -48,7 +47,7 @@ Summary(pl.UTF-8): Pliki programistyczne biblioteki glog
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gflags-devel >= 2.2.2
-Requires: libstdc++-devel
+Requires: libstdc++-devel >= 6:5
%description devel
This package contains the header files for developing applications
@@ -72,7 +71,6 @@ Statyczna biblioteka glog.
%prep
%setup -q
-%patch -P0 -p1
%build
%if %{with static_libs}
@@ -86,6 +84,7 @@ Statyczna biblioteka glog.
%cmake -B build \
%{!?with_tests:-DWITH_GTEST=OFF} \
+ -DWITH_PKGCONFIG=ON \
%{!?with_libunwind:-DWITH_UNWIND=OFF}
%{__make} -C build
@@ -113,16 +112,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README.rst
-%attr(755,root,root) %{_libdir}/libglog.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglog.so.1
+%doc AUTHORS CONTRIBUTORS COPYING ChangeLog README.rst
+%{_libdir}/libglog.so.*.*.*
+%ghost %{_libdir}/libglog.so.2
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libglog.so
+%{_libdir}/libglog.so
%{_includedir}/glog
%{_pkgconfigdir}/libglog.pc
%{_libdir}/cmake/glog
+%dir %{_datadir}/glog
+%{_datadir}/glog/cmake
%if %{with static_libs}
%files static
diff --git a/avoid-inline-asm.patch b/avoid-inline-asm.patch
deleted file mode 100644
index a442051..0000000
--- a/avoid-inline-asm.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-http://code.google.com/p/google-glog/issues/detail?id=130
-
-make the code work with all gcc targets
-
---- glog-0.6.0/src/symbolize_unittest.cc.orig 2019-03-22 03:51:46.000000000 +0100
-+++ glog-0.6.0/src/symbolize_unittest.cc 2019-03-28 20:39:09.755256776 +0100
-@@ -78,9 +78,7 @@ static const char *TrySymbolize(void *pc
- # endif // __i386__
- # else
- # endif // __GNUC__ >= 4
--# if defined(__i386__) || defined(__x86_64__)
--# define TEST_X86_32_AND_64 1
--# endif // defined(__i386__) || defined(__x86_64__)
-+# define TEST_WITH_LABEL_ADDRESSES
- #endif
-
- // Make them C linkage to avoid mangled names.
-@@ -320,8 +318,9 @@ TEST(Symbolize, SymbolizeWithDemanglingS
- extern "C" {
- inline void* always_inline inline_func() {
- void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
-- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+ pc = &&curr_pc;
-+ curr_pc:
- #endif
- return pc;
- }
-@@ -329,14 +328,15 @@ inline void* always_inline inline_func()
- void* ATTRIBUTE_NOINLINE non_inline_func();
- void* ATTRIBUTE_NOINLINE non_inline_func() {
- void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
-- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+ pc = &&curr_pc;
-+ curr_pc:
- #endif
- return pc;
- }
-
- static void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE)
- void *pc = non_inline_func();
- const char *symbol = TrySymbolize(pc);
-
-@@ -349,7 +349,7 @@ static void ATTRIBUTE_NOINLINE TestWithP
- }
-
- static void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
- void *pc = inline_func(); // Must be inlined.
- const char *symbol = TrySymbolize(pc);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glog.git/commitdiff/b8a07671e9688543fda80cf9115d42a6b508f570
More information about the pld-cvs-commit
mailing list