diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2024-10-12 14:53:11 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-10-12 07:57:16 -0700 |
| commit | 148240ee8a5ca1d506f3b796b7f362b9d9fbb0a8 (patch) | |
| tree | acde5069f8d68149b9f230989b0393e1ca753965 | |
| parent | 288447b754b92776ca78b21f2c34c3e40d4a1279 (diff) | |
| download | meta-openembedded-148240ee8a5ca1d506f3b796b7f362b9d9fbb0a8.tar.gz | |
glog: upgrade 0.6.0 -> 0.7.1
ChangeLog:
https://github.com/google/glog/releases/tag/v0.7.0
https://github.com/google/glog/releases/tag/v0.7.1
Drop 0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch and
libexecinfo.patch as the issues have been fixed upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/glog/glog/libexecinfo.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-support/glog/glog_0.7.1.bb (renamed from meta-oe/recipes-support/glog/glog_0.6.0.bb) | 7 |
3 files changed, 3 insertions, 77 deletions
diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch deleted file mode 100644 index 3732c62cd0..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 18 Feb 2023 13:14:14 -0800 | ||
| 4 | Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long | ||
| 5 | |||
| 6 | Fixes following error on 32bit platforms | ||
| 7 | |||
| 8 | src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing] | ||
| 9 | const struct timespec req = {0, t * 1000 * 1000}; | ||
| 10 | ^~~~~~~~~~~~~~~ | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/google/glog/pull/894] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | src/googletest.h | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/googletest.h b/src/googletest.h | ||
| 19 | index 5761361..836b06c 100644 | ||
| 20 | --- a/src/googletest.h | ||
| 21 | +++ b/src/googletest.h | ||
| 22 | @@ -625,7 +625,7 @@ class Thread { | ||
| 23 | #endif | ||
| 24 | }; | ||
| 25 | |||
| 26 | -static inline void SleepForMilliseconds(unsigned t) { | ||
| 27 | +static inline void SleepForMilliseconds(long t) { | ||
| 28 | #ifndef GLOG_OS_WINDOWS | ||
| 29 | # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L | ||
| 30 | const struct timespec req = {0, t * 1000 * 1000}; | ||
| 31 | -- | ||
| 32 | 2.39.2 | ||
| 33 | |||
diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch deleted file mode 100644 index a791a40dbc..0000000000 --- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 8 Mar 2021 14:58:40 -0800 | ||
| 4 | Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based | ||
| 5 | systems | ||
| 6 | |||
| 7 | Fixes | ||
| 8 | ld: libglog.so.0.4.0: undefined reference to `backtrace' | ||
| 9 | | collect2: error: ld returned 1 exit status | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | |||
| 14 | --- | ||
| 15 | CMakeLists.txt | 5 +++++ | ||
| 16 | 1 file changed, 5 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 19 | index 846b444..1553358 100644 | ||
| 20 | --- a/CMakeLists.txt | ||
| 21 | +++ b/CMakeLists.txt | ||
| 22 | @@ -162,6 +162,7 @@ cmake_pop_check_state () | ||
| 23 | check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) | ||
| 24 | |||
| 25 | check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) | ||
| 26 | +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) | ||
| 27 | |||
| 28 | check_cxx_source_compiles (" | ||
| 29 | #include <cstdlib> | ||
| 30 | @@ -629,6 +630,10 @@ if (Unwind_FOUND) | ||
| 31 | set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") | ||
| 32 | endif (Unwind_FOUND) | ||
| 33 | |||
| 34 | +if (HAVE_EXECINFO) | ||
| 35 | + target_link_libraries (glog PUBLIC execinfo) | ||
| 36 | +endif (HAVE_EXECINFO) | ||
| 37 | + | ||
| 38 | if (HAVE_DBGHELP) | ||
| 39 | target_link_libraries (glog PRIVATE dbghelp) | ||
| 40 | set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") | ||
diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.7.1.bb index ec39604f44..586afcad53 100644 --- a/meta-oe/recipes-support/glog/glog_0.6.0.bb +++ b/meta-oe/recipes-support/glog/glog_0.7.1.bb | |||
| @@ -4,15 +4,13 @@ macros." | |||
| 4 | HOMEPAGE = "https://github.com/google/glog" | 4 | HOMEPAGE = "https://github.com/google/glog" |
| 5 | 5 | ||
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=583a6ead531ca3cd5a2ea593a2888800" |
| 8 | 8 | ||
| 9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| 10 | git://github.com/google/glog.git;branch=master;protocol=https \ | 10 | git://github.com/google/glog.git;branch=master;protocol=https \ |
| 11 | file://libexecinfo.patch \ | ||
| 12 | file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ | ||
| 13 | " | 11 | " |
| 14 | 12 | ||
| 15 | SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" | 13 | SRCREV = "7b134a5c82c0c0b5698bb6bf7a835b230c5638e4" |
| 16 | 14 | ||
| 17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
| 18 | 16 | ||
| @@ -24,6 +22,7 @@ PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics" | |||
| 24 | PACKAGECONFIG:remove:mipsarch = "64bit-atomics" | 22 | PACKAGECONFIG:remove:mipsarch = "64bit-atomics" |
| 25 | PACKAGECONFIG:remove:armv5 = "64bit-atomics" | 23 | PACKAGECONFIG:remove:armv5 = "64bit-atomics" |
| 26 | PACKAGECONFIG:remove:armv6 = "64bit-atomics" | 24 | PACKAGECONFIG:remove:armv6 = "64bit-atomics" |
| 25 | PACKAGECONFIG:remove:powerpc = "64bit-atomics" | ||
| 27 | 26 | ||
| 28 | PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" | 27 | PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" |
| 29 | PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" | 28 | PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" |
