From 959182dfa0b51a4577f34f7ba7a6b56e2ba2fde4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 16 Feb 2023 16:33:22 +0800 Subject: glog: upgrade 0.5.0 -> 0.6.0 libexecinfo.patch refreshed for new version. Changelog: =========== bazel: Use glog 0.5.0 in README Expose IsGoogleLoggingInitialized() in public API. Fix cmake configuration for cygwin environment Allow updating vmodule levels after vmodule level has been cached Export COPYING cmake: fixed msvc snprintf detection (fixes #668) cmake: allow to override -fPIC cmake: export availability (fixes #667) Remove ubuntu1604 from presubmit.yml bazel: add GLOG_CUSTOM_PREFIX_SUPPORT log messages periodically (time-based) ci: support more targets cmake: prefer linking against gflags::gflags (fixes #683) Fix syscall deprecation warning on macOS >= 10.12 fixed exception specification mismatch readme: fix wrong header id eliminate warnings fixed additional warnings Add an static cast to compare unsigned with unsigned Fix: not implement virtual class when WITH_CUSTOM_PREFIX on Change size type in AnnotateBenignRaceSized to size_t from long Fix link error for Emscripten raw_logging.h depends on type definition in logging.h. export OS_* defines (fixes #715) Fix syscall warning in Bazel Build Add -Werror to Bazel presubmits added gmock support Support stack unwind on Android add linux github workflow ci: replace generated headers by templates add mock log test added log cleaner tests and fixed paths Make LogCleaner support relative paths cmake: Fix incorrect relative-path concatenation Restore the stream format after writing the log prefix fix glog-modules.cmake install protect VLOG by use_logging Fix log filename format Add Zhuoran Shen to AUTHORS and CONTRIBUTORS ci: reworked windows builds cmake: set CMP0074 policy ci: use codecov token Added gmtoff() method in 'LogMessageTime' to get GMT offset LogCleaner: Fix relative paths and add a new test eliminate msvc warnings cmake: require at least version 3.16 ci: enable warnings as errors LogCleaner: make overdue_days_ unsigned int ci: remove deprecated msvc runner provide backward compatible send overload run clang-tidy eliminate clang warnings ensure _Unwind_Backtrace to actually be available cmake: do not search for platform specific unwind revert to signed int atomics Add the "FLAG_log_year_in_prefix" use uint32 for --max-log-size stdcxx: eliminate excessive use of std::string::c_str() cmake: require at least gflags 2.2.2 Changed my Email ID On Solaris, GetHostName() returns empty string LogCleaner: avoid scanning logs too frequently libglog.pc: Set Libs.private for static linking cmake: enable custom prefix by default simplify flags export rename GOOGLE_GLOG_DLL_DECL to GLOG_EXPORT cmake_package_config_generate: Fix CMake warnings with CMake 3.23 Tests: Respect TEST_TMPDIR, TMPDIR, TMP environmental variables Add the logtostdout and colorlogtostdout flag to allow logging to stdout Add clang-cl.exe to Bazel CI Fix "'GLOG_EXPORT' macro redefined" on clang-cl Fix namespace resolution issue in LOG_EVERY_T Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-support/glog/glog/libexecinfo.patch | 23 ++++++++++---- meta-oe/recipes-support/glog/glog_0.5.0.bb | 35 ---------------------- meta-oe/recipes-support/glog/glog_0.6.0.bb | 35 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-support/glog/glog_0.5.0.bb create mode 100644 meta-oe/recipes-support/glog/glog_0.6.0.bb diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch index 927c269a6a..a791a40dbc 100644 --- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ b/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -1,4 +1,8 @@ -Link libexecinfo if its found, this is needed for musl based systems +From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 8 Mar 2021 14:58:40 -0800 +Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based + systems Fixes ld: libglog.so.0.4.0: undefined reference to `backtrace' @@ -6,17 +10,24 @@ ld: libglog.so.0.4.0: undefined reference to `backtrace' Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b444..1553358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -144,6 +144,7 @@ check_cxx_compiler_flag (-Wunnamed-type- - check_symbol_exists (snprintf cstdio HAVE_SNPRINTF) +@@ -162,6 +162,7 @@ cmake_pop_check_state () + check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) check_cxx_source_compiles (" #include -@@ -584,6 +585,10 @@ if (Unwind_FOUND) +@@ -629,6 +630,10 @@ if (Unwind_FOUND) set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") endif (Unwind_FOUND) @@ -25,5 +36,5 @@ Signed-off-by: Khem Raj +endif (HAVE_EXECINFO) + if (HAVE_DBGHELP) - target_link_libraries (glog PUBLIC dbghelp) - endif (HAVE_DBGHELP) + target_link_libraries (glog PRIVATE dbghelp) + set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") diff --git a/meta-oe/recipes-support/glog/glog_0.5.0.bb b/meta-oe/recipes-support/glog/glog_0.5.0.bb deleted file mode 100644 index 61581d96d7..0000000000 --- a/meta-oe/recipes-support/glog/glog_0.5.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "The glog library implements application-level logging. This \ -library provides logging APIs based on C++-style streams and various helper \ -macros." -HOMEPAGE = "https://github.com/google/glog" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" - -SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1;protocol=https \ - file://libexecinfo.patch \ -" - -SRCREV = "8f9ccfe770add9e4c64e9b25c102658e3c763b73" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ?= "shared unwind" -PACKAGECONFIG:remove:riscv64 = "unwind" -PACKAGECONFIG:remove:riscv32 = "unwind" -PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" -PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" - -PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" -PACKAGECONFIG[execinfo] = ",,libexecinfo" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:append() { - # remove WORKDIR info to improve reproducibility - if [ -f "${B}/config.h" ] ; then - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h - fi -} diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.6.0.bb new file mode 100644 index 0000000000..18291600c5 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The glog library implements application-level logging. This \ +library provides logging APIs based on C++-style streams and various helper \ +macros." +HOMEPAGE = "https://github.com/google/glog" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" + +SRC_URI = " \ + git://github.com/google/glog.git;nobranch=1;protocol=https \ + file://libexecinfo.patch \ +" + +SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ?= "shared unwind" +PACKAGECONFIG:remove:riscv64 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind" +PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" +PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" + +PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" +PACKAGECONFIG[execinfo] = ",,libexecinfo" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure:append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} -- cgit v1.2.3-54-g00ecf