From 726e33572cd05c304a49c137c4d1230e8fa6517a Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Sun, 27 Sep 2026 23:49:59 +1300 Subject: [PATCH] zlog: upgrade 1.2.18 -> 1.2.19 Dropped patches that are part of the upstream version. Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...01-Don-t-overwrite-systemwide-cflags.patch | 31 ------------------- .../files/upgrade_cmake_minimum_version.patch | 25 --------------- .../zlog/{zlog_1.2.18.bb => zlog_1.2.19.bb} | 6 ++-- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch delete mode 100644 meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch rename meta-oe/recipes-extended/zlog/{zlog_1.2.18.bb => zlog_1.2.19.bb} (58%) diff --git a/meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch b/meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch deleted file mode 100644 index f09f517b98..0000000000 --- a/meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ee35b6507993e79fc594e3b7ad50174e33e68daa Mon Sep 17 00:00:00 2001 -From: Gyorgy Sarvari -Date: Wed, 24 Sep 2025 11:22:29 +0200 -Subject: [PATCH] Don't overwrite systemwide cflags - -Instead of overriding the cflags from the system, just append to them. - -Upstream-Status: Submitted [https://github.com/HardySimpson/zlog/pull/306] - -Signed-off-by: Gyorgy Sarvari ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8981934..f2bd574 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,9 +33,9 @@ SET(ZLOG_SO_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}) - message(STATUS "platform : ${CMAKE_SYSTEM}") - - add_definitions("-g -Wall -Wstrict-prototypes") --set(CMAKE_C_FLAGS "-std=c99 -pedantic -D_DEFAULT_SOURCE") --set(CMAKE_C_FLAGS_DEBUG "-ggdb3 -DDEBUG") --set(CMAKE_C_FLAGS_RELEASE "-O2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -D_DEFAULT_SOURCE") -+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3 -DDEBUG") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2") - - if (WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 ") diff --git a/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch deleted file mode 100644 index 9d02066d57..0000000000 --- a/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3715879775f725260aeda14f94887bbc7a007e29 Mon Sep 17 00:00:00 2001 -From: haydenZhou -Date: Sun, 8 Jun 2025 10:45:05 +0800 -Subject: [PATCH] upgrade cmake minimum version - -Upstream-Status: Backport [https://github.com/HardySimpson/zlog/commit/3715879775f725260aeda14f94887bbc7a007e29] - -Signed-off-by: Gyorgy Sarvari ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ddaf8d..31a1553 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ - # limitations under the License. - #/ - --cmake_minimum_required(VERSION 2.8.5) -+cmake_minimum_required(VERSION 3.12) - - message(STATUS "path : ${CMAKE_FIND_ROOT_PATH}") - project(zlog) diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.19.bb similarity index 58% rename from meta-oe/recipes-extended/zlog/zlog_1.2.18.bb rename to meta-oe/recipes-extended/zlog/zlog_1.2.19.bb index 937c478de3..e3355bb2db 100644 --- a/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb +++ b/meta-oe/recipes-extended/zlog/zlog_1.2.19.bb @@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https;tag=${PV} \ - file://upgrade_cmake_minimum_version.patch \ - file://0001-Don-t-overwrite-systemwide-cflags.patch" -SRCREV = "7fe61ca6265516e9327a51fc394b2adb126c2ef3" +SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https;tag=${PV}" +SRCREV = "728602097c5f07f860f7ca32baecb229d89a2637" inherit cmake