diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-09-24 11:41:22 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-09-24 10:54:44 -0700 |
| commit | 8891ca87488384c0ab65b5d77c1278187080753d (patch) | |
| tree | b1eaabf30369ca893474ec502a653d9676ddbbf8 /meta-oe/recipes-extended/zlog/files | |
| parent | 6ac3bc3950334096b8e7633d250122c4195fc8b6 (diff) | |
| download | meta-openembedded-8891ca87488384c0ab65b5d77c1278187080753d.tar.gz | |
zlog: upgrade 1.2.16 -> 1.2.18
Switched to cmake. Added a backported patch to be able to use
the latest version of cmake.
Also, add a new patch to avoid overwritingg all the CFLAGS set by Yocto,
which helps with avoiding the inclusion of TMPDIR in the generated files.
License-Update: License changed to Apache2:
https://github.com/HardySimpson/zlog/commit/1a7b1a6fb956b92a4079ccc91f30da21f34ca063
Changelog:
1.2.18:
- patched severe vulnerability CVE-2024-22857
- restructured build system
1.2.17:
- Change Lience to Apache 2.0, for more people
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/zlog/files')
| -rw-r--r-- | meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch | 25 |
2 files changed, 56 insertions, 0 deletions
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 new file mode 100644 index 0000000000..f09f517b98 --- /dev/null +++ b/meta-oe/recipes-extended/zlog/files/0001-Don-t-overwrite-systemwide-cflags.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From ee35b6507993e79fc594e3b7ad50174e33e68daa Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Wed, 24 Sep 2025 11:22:29 +0200 | ||
| 4 | Subject: [PATCH] Don't overwrite systemwide cflags | ||
| 5 | |||
| 6 | Instead of overriding the cflags from the system, just append to them. | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/HardySimpson/zlog/pull/306] | ||
| 9 | |||
| 10 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 11 | --- | ||
| 12 | CMakeLists.txt | 6 +++--- | ||
| 13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 16 | index 8981934..f2bd574 100644 | ||
| 17 | --- a/CMakeLists.txt | ||
| 18 | +++ b/CMakeLists.txt | ||
| 19 | @@ -33,9 +33,9 @@ SET(ZLOG_SO_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}) | ||
| 20 | message(STATUS "platform : ${CMAKE_SYSTEM}") | ||
| 21 | |||
| 22 | add_definitions("-g -Wall -Wstrict-prototypes") | ||
| 23 | -set(CMAKE_C_FLAGS "-std=c99 -pedantic -D_DEFAULT_SOURCE") | ||
| 24 | -set(CMAKE_C_FLAGS_DEBUG "-ggdb3 -DDEBUG") | ||
| 25 | -set(CMAKE_C_FLAGS_RELEASE "-O2") | ||
| 26 | +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -D_DEFAULT_SOURCE") | ||
| 27 | +set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3 -DDEBUG") | ||
| 28 | +set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2") | ||
| 29 | |||
| 30 | if (WIN32) | ||
| 31 | 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 new file mode 100644 index 0000000000..9d02066d57 --- /dev/null +++ b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From 3715879775f725260aeda14f94887bbc7a007e29 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: haydenZhou <mfkhao2009@outlook.com> | ||
| 3 | Date: Sun, 8 Jun 2025 10:45:05 +0800 | ||
| 4 | Subject: [PATCH] upgrade cmake minimum version | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://github.com/HardySimpson/zlog/commit/3715879775f725260aeda14f94887bbc7a007e29] | ||
| 7 | |||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | CMakeLists.txt | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 14 | index 5ddaf8d..31a1553 100644 | ||
| 15 | --- a/CMakeLists.txt | ||
| 16 | +++ b/CMakeLists.txt | ||
| 17 | @@ -14,7 +14,7 @@ | ||
| 18 | # limitations under the License. | ||
| 19 | #/ | ||
| 20 | |||
| 21 | -cmake_minimum_required(VERSION 2.8.5) | ||
| 22 | +cmake_minimum_required(VERSION 3.12) | ||
| 23 | |||
| 24 | message(STATUS "path : ${CMAKE_FIND_ROOT_PATH}") | ||
| 25 | project(zlog) | ||
