diff mbox series

[meta-oe,1/5] gflags: upgrade 2.2.2 -> 2.3.0

Message ID 20251209055428.22306-1-liuyd.fnst@fujitsu.com
State Under Review
Headers show
Series [meta-oe,1/5] gflags: upgrade 2.2.2 -> 2.3.0 | expand

Commit Message

Yiding Liu (Fujitsu) Dec. 9, 2025, 5:54 a.m. UTC
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>
---
 .../0001-allow-build-with-cmake-4.patch       | 69 -------------------
 .../{gflags_2.2.2.bb => gflags_2.3.0.bb}      |  5 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch
 rename meta-oe/recipes-support/gflags/{gflags_2.2.2.bb => gflags_2.3.0.bb} (79%)

Comments

Khem Raj Dec. 9, 2025, 7:27 p.m. UTC | #1
On Mon, Dec 8, 2025 at 9:54 PM Yiding Liu (Fujitsu) via
lists.openembedded.org <liuyd.fnst=fujitsu.com@lists.openembedded.org>
wrote:

> 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>
> ---
>  .../0001-allow-build-with-cmake-4.patch       | 69 -------------------
>  .../{gflags_2.2.2.bb => gflags_2.3.0.bb}      |  5 +-
>  2 files changed, 2 insertions(+), 72 deletions(-)
>  delete mode 100644
> meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch
>  rename meta-oe/recipes-support/gflags/{gflags_2.2.2.bb => gflags_2.3.0.bb}
> (79%)
>
> 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 @@
> -From b533cf275db99b1d37ba20d96497cafcedc9ace0 Mon Sep 17 00:00:00 2001
> -From: Alper Ak <alperyasinak1@gmail.com>
> -Date: Tue, 8 Jul 2025 18:57:26 +0300
> -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
> - compatibility
> -
> -Fix:
> -
> -| CMake Error at CMakeLists.txt:73 (cmake_minimum_required):
> -|   Compatibility with CMake < 3.5 has been removed from CMake.
> -|
> -|   Update the VERSION argument <min> value.  Or, use the <min>...<max>
> syntax
> -|   to tell CMake that the project requires at least <min> but has been
> updated
> -|   to work with policies introduced by <max> or earlier.
> -|
> -|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
> -|
> -|
> -| -- Configuring incomplete, errors occurred!
> -
> -Upstream-Status: Backport [
> https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080
> ]
> -
> -Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
> ----
> - CMakeLists.txt             | 2 +-
> - test/config/CMakeLists.txt | 2 +-
> - test/nc/CMakeLists.txt     | 2 +-
> - 3 files changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 657a1f4..a5440bb 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -70,7 +70,7 @@
> - ## - GFLAGS_INSTALL_SHARED_LIBS
> - ## - GFLAGS_INSTALL_STATIC_LIBS
> -
> --cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR)
> -+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
> -
> - if (POLICY CMP0042)
> -   cmake_policy (SET CMP0042 NEW)
> -diff --git a/test/config/CMakeLists.txt b/test/config/CMakeLists.txt
> -index 6190b25..205121e 100644
> ---- a/test/config/CMakeLists.txt
> -+++ b/test/config/CMakeLists.txt
> -@@ -1,6 +1,6 @@
> - ## gflags package configuration tests
> -
> --cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
> -+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
> -
> - project (gflags_${TEST_NAME})
> -
> -diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt
> -index d00b07d..1b4d511 100644
> ---- a/test/nc/CMakeLists.txt
> -+++ b/test/nc/CMakeLists.txt
> -@@ -1,6 +1,6 @@
> - ## gflags negative compilation tests
> -
> --cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
> -+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
> -
> - if (NOT TEST_NAME)
> -   message (FATAL_ERROR "Missing TEST_NAME CMake flag")
> ---
> -2.43.0
> -
> diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
> b/meta-oe/recipes-support/gflags/gflags_2.3.0.bb
> similarity index 79%
> rename from meta-oe/recipes-support/gflags/gflags_2.2.2.bb
> rename to 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"
>  LICENSE = "BSD-3-Clause"
>  LIC_FILES_CHKSUM =
> "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
>
> -SRC_URI = "git://
> github.com/gflags/gflags.git;branch=master;protocol=https \
> -        file://0001-allow-build-with-cmake-4.patch"
> -SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
> +SRC_URI = "git://github.com/gflags/gflags.git;branch=main;protocol=https"
>

As a followup, it will be good to add tag=v${PV} to SRC_URI


> +SRCREV = "33bb3461e10864b5406353d3a1fb7ff34c2314b8"
>
>  inherit cmake
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#122394):
> https://lists.openembedded.org/g/openembedded-devel/message/122394
> Mute This Topic: https://lists.openembedded.org/mt/116690267/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

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 @@ 
-From b533cf275db99b1d37ba20d96497cafcedc9ace0 Mon Sep 17 00:00:00 2001
-From: Alper Ak <alperyasinak1@gmail.com>
-Date: Tue, 8 Jul 2025 18:57:26 +0300
-Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
- compatibility
-
-Fix:
-
-| CMake Error at CMakeLists.txt:73 (cmake_minimum_required):
-|   Compatibility with CMake < 3.5 has been removed from CMake.
-|
-|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
-|   to tell CMake that the project requires at least <min> but has been updated
-|   to work with policies introduced by <max> or earlier.
-|
-|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Backport [https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080]
-
-Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
----
- CMakeLists.txt             | 2 +-
- test/config/CMakeLists.txt | 2 +-
- test/nc/CMakeLists.txt     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 657a1f4..a5440bb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,7 +70,7 @@
- ## - GFLAGS_INSTALL_SHARED_LIBS
- ## - GFLAGS_INSTALL_STATIC_LIBS
- 
--cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR)
-+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- 
- if (POLICY CMP0042)
-   cmake_policy (SET CMP0042 NEW)
-diff --git a/test/config/CMakeLists.txt b/test/config/CMakeLists.txt
-index 6190b25..205121e 100644
---- a/test/config/CMakeLists.txt
-+++ b/test/config/CMakeLists.txt
-@@ -1,6 +1,6 @@
- ## gflags package configuration tests
- 
--cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- 
- project (gflags_${TEST_NAME})
- 
-diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt
-index d00b07d..1b4d511 100644
---- a/test/nc/CMakeLists.txt
-+++ b/test/nc/CMakeLists.txt
-@@ -1,6 +1,6 @@
- ## gflags negative compilation tests
- 
--cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-+cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- 
- if (NOT TEST_NAME)
-   message (FATAL_ERROR "Missing TEST_NAME CMake flag")
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.3.0.bb
similarity index 79%
rename from meta-oe/recipes-support/gflags/gflags_2.2.2.bb
rename to 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"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
 
-SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https \
-        file://0001-allow-build-with-cmake-4.patch"
-SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
+SRC_URI = "git://github.com/gflags/gflags.git;branch=main;protocol=https"
+SRCREV = "33bb3461e10864b5406353d3a1fb7ff34c2314b8"
 
 inherit cmake