From fea43ed974e97dc2c678106595e2970ad795626c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sat, 10 Jan 2026 21:38:07 +0800 Subject: nanomsg: upgrade 1.2.1 -> 1.2.2 ChangeLog: https://github.com/nanomsg/nanomsg/releases/tag/1.2.2 Drop 0001-allow-build-with-cmake-4.patch as the issue has been fixed upstream. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../nanomsg/0001-allow-build-with-cmake-4.patch | 57 ---------------------- .../recipes-connectivity/nanomsg/nanomsg_1.2.1.bb | 29 ----------- .../recipes-connectivity/nanomsg/nanomsg_1.2.2.bb | 28 +++++++++++ 3 files changed, 28 insertions(+), 86 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/nanomsg/nanomsg/0001-allow-build-with-cmake-4.patch delete mode 100644 meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb create mode 100644 meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg/0001-allow-build-with-cmake-4.patch b/meta-networking/recipes-connectivity/nanomsg/nanomsg/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index f61966134d..0000000000 --- a/meta-networking/recipes-connectivity/nanomsg/nanomsg/0001-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2e293eb9d3753ef87a5e05bc6ac270add0ad8fa8 Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Wed, 9 Jul 2025 13:25:54 +0300 -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ - compatibility - -Fix: - -| CMake Error at CMakeLists.txt:27 (cmake_minimum_required): -| Compatibility with CMake < 3.5 has been removed from CMake. -| -| Update the VERSION argument value. Or, use the ... syntax -| to tell CMake that the project requires at least but has been updated -| to work with policies introduced by or earlier. -| -| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. -| -| -| -- Configuring incomplete, errors occurred! - -Upstream-Status: Submitted [https://github.com/nanomsg/nanomsg/pull/1123] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - demo/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9ae6a24..2e93724d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ - # IN THE SOFTWARE. - # - --cmake_minimum_required (VERSION 2.8.12) -+cmake_minimum_required (VERSION 3.5) - - project (nanomsg C) - include (CheckFunctionExists) -diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt -index 4807f160..5ea96c4a 100644 ---- a/demo/CMakeLists.txt -+++ b/demo/CMakeLists.txt -@@ -6,7 +6,7 @@ - # - # Thanks for the idea goes to @maddouri. - # --cmake_minimum_required (VERSION 2.8.7) -+cmake_minimum_required (VERSION 3.5) - - project(nanomsg-demo) - --- -2.43.0 - diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb deleted file mode 100644 index 3aaf056adf..0000000000 --- a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "nanomsg socket library" -DESCRIPTION = "nanomsg is a socket library that provides several common \ -communication patterns. It aims to make the networking layer fast, scalable, \ -and easy to use. Implemented in C, it works on a wide range of operating \ -systems with no further dependencies." -HOMEPAGE = "https://nanomsg.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" - -SECTION = "libs/networking" - -SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master \ - file://0001-allow-build-with-cmake-4.patch" - -SRCREV = "fc3f684a80151a3319446fc96083a9ff384ee4fe" - - -inherit cmake pkgconfig - -# nanomsg documentation generation requires asciidoctor, -# not asciidoc, and currently there's no asciidoctor-native -# recipe anywhere in openembedded-core or meta-openembedded -EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF " - -# we don't want nanomsg-tools to be renamed to libnanomsg-tools -DEBIAN_NOAUTONAME:${PN}-tools = "1" - -PACKAGES =+ "${PN}-tools" -FILES:${PN}-tools = "${bindir}/*" diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb new file mode 100644 index 0000000000..10ae7a61d7 --- /dev/null +++ b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "nanomsg socket library" +DESCRIPTION = "nanomsg is a socket library that provides several common \ +communication patterns. It aims to make the networking layer fast, scalable, \ +and easy to use. Implemented in C, it works on a wide range of operating \ +systems with no further dependencies." +HOMEPAGE = "https://nanomsg.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" + +SECTION = "libs/networking" + +SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master \ + " + +SRCREV = "ccd7f20c1b756f7041598383baffcdc326246db7" + +inherit cmake pkgconfig + +# nanomsg documentation generation requires asciidoctor, +# not asciidoc, and currently there's no asciidoctor-native +# recipe anywhere in openembedded-core or meta-openembedded +EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF " + +# we don't want nanomsg-tools to be renamed to libnanomsg-tools +DEBIAN_NOAUTONAME:${PN}-tools = "1" + +PACKAGES =+ "${PN}-tools" +FILES:${PN}-tools = "${bindir}/*" -- cgit v1.2.3-54-g00ecf