diff options
| author | Liu Yiding <liuyd.fnst@fujitsu.com> | 2025-12-09 13:54:28 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-12-08 23:22:18 -0800 |
| commit | 9452f1205bc4af1e5c9087947fb5389be8be71f4 (patch) | |
| tree | c90e4a6f29fbf8e53e04eb58c38674e16423d194 /meta-oe | |
| parent | aa758279f5ec0b5f19c61d050b9d516132367706 (diff) | |
| download | meta-openembedded-9452f1205bc4af1e5c9087947fb5389be8be71f4.tar.gz | |
gflags: upgrade 2.2.2 -> 2.3.0
1.Change log:
https://github.com/gflags/gflags/releases/tag/v2.3.0
2. Drop 0001-allow-build-with-cmake-4.patch as it was mergerd upstream.
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch | 69 | ||||
| -rw-r--r-- | meta-oe/recipes-support/gflags/gflags_2.3.0.bb (renamed from meta-oe/recipes-support/gflags/gflags_2.2.2.bb) | 5 |
2 files changed, 2 insertions, 72 deletions
diff --git a/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index bc3ca94de8..0000000000 --- a/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,69 +0,0 @@ | |||
| 1 | From b533cf275db99b1d37ba20d96497cafcedc9ace0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 8 Jul 2025 18:57:26 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:73 (cmake_minimum_required): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Backport [https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | test/config/CMakeLists.txt | 2 +- | ||
| 27 | test/nc/CMakeLists.txt | 2 +- | ||
| 28 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 31 | index 657a1f4..a5440bb 100644 | ||
| 32 | --- a/CMakeLists.txt | ||
| 33 | +++ b/CMakeLists.txt | ||
| 34 | @@ -70,7 +70,7 @@ | ||
| 35 | ## - GFLAGS_INSTALL_SHARED_LIBS | ||
| 36 | ## - GFLAGS_INSTALL_STATIC_LIBS | ||
| 37 | |||
| 38 | -cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR) | ||
| 39 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
| 40 | |||
| 41 | if (POLICY CMP0042) | ||
| 42 | cmake_policy (SET CMP0042 NEW) | ||
| 43 | diff --git a/test/config/CMakeLists.txt b/test/config/CMakeLists.txt | ||
| 44 | index 6190b25..205121e 100644 | ||
| 45 | --- a/test/config/CMakeLists.txt | ||
| 46 | +++ b/test/config/CMakeLists.txt | ||
| 47 | @@ -1,6 +1,6 @@ | ||
| 48 | ## gflags package configuration tests | ||
| 49 | |||
| 50 | -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) | ||
| 51 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
| 52 | |||
| 53 | project (gflags_${TEST_NAME}) | ||
| 54 | |||
| 55 | diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt | ||
| 56 | index d00b07d..1b4d511 100644 | ||
| 57 | --- a/test/nc/CMakeLists.txt | ||
| 58 | +++ b/test/nc/CMakeLists.txt | ||
| 59 | @@ -1,6 +1,6 @@ | ||
| 60 | ## gflags negative compilation tests | ||
| 61 | |||
| 62 | -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) | ||
| 63 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
| 64 | |||
| 65 | if (NOT TEST_NAME) | ||
| 66 | message (FATAL_ERROR "Missing TEST_NAME CMake flag") | ||
| 67 | -- | ||
| 68 | 2.43.0 | ||
| 69 | |||
diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.3.0.bb index 925aa6d6e6..0e510bb59a 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.3.0.bb | |||
| @@ -3,9 +3,8 @@ HOMEPAGE = "https://github.com/gflags/gflags" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" | 4 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https \ | 6 | SRC_URI = "git://github.com/gflags/gflags.git;branch=main;protocol=https" |
| 7 | file://0001-allow-build-with-cmake-4.patch" | 7 | SRCREV = "33bb3461e10864b5406353d3a1fb7ff34c2314b8" |
| 8 | SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" | ||
| 9 | 8 | ||
| 10 | inherit cmake | 9 | inherit cmake |
| 11 | 10 | ||
