summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlper Ak <alperyasinak1@gmail.com>2025-07-10 20:38:26 +0300
committerKhem Raj <raj.khem@gmail.com>2025-07-10 10:46:24 -0700
commita67964c575278dee8fe4c3b0458caaacf2724db7 (patch)
tree14571dd5398d4c7ac73a5c25b04b8131471dc8ad
parent1109cc27a56698bcea7dec11a7ff45d7b3b69b5e (diff)
downloadmeta-openembedded-a67964c575278dee8fe4c3b0458caaacf2724db7.tar.gz
sqlite-orm: Upgrade 1.5 -> 1.9.1 to allow CMake 4+ compatibility
- Dropped the patch as the issue is already fixed in the newer version. - The LICENSE file has changed so updated LIC_FILES_CHKSUM to match the new md5sum. - Updated CMake flag to disable tests according to the new version. Changelog: https://github.com/fnc12/sqlite_orm/compare/v1.5...v1.9.1 https://github.com/fnc12/sqlite_orm/releases Fix: | CMake Error at CMakeLists.txt:1 (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! Signed-off-by: Alper Ak <alperyasinak1@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch52
-rw-r--r--meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb (renamed from meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb)7
2 files changed, 3 insertions, 56 deletions
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
deleted file mode 100644
index af884808f2..0000000000
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From f011501e719e0042fc6ca29ac7b33e8a14562246 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Tue, 1 Apr 2025 19:45:01 +0900
4Subject: [PATCH] fix cstdint error with gcc-15.0.1
5
6* see more details:
7 http://errors.yoctoproject.org/Errors/Details/850148/
8 TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:7:5: error: 'uint16_t' does not name a type
9 7 | uint16_t src_port;
10 | ^~~~~~~~
11 TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:3:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
12 2 | #include <sqlite_orm/sqlite_orm.h>
13 +++ |+#include <cstdint>
14 3 | #include <string>
15
16While this was backported from 6a96d1cec4(Explicitly included <cstdint> in examples and unit tests),
17since it was a commit made in v1.9, only synchronous.cpp was modified as other files do not exist in the current version.
18
19Signed-off-by: mark.yang <mark.yang@lge.com>
20
21Upstream-Status: Backport [6a96d1c Explicitly included <cstdint> in examples and unit tests]
22---
23 examples/synchronous.cpp | 11 ++++++-----
24 1 file changed, 6 insertions(+), 5 deletions(-)
25
26diff --git a/examples/synchronous.cpp b/examples/synchronous.cpp
27index d10da13d..b103b48c 100644
28--- a/examples/synchronous.cpp
29+++ b/examples/synchronous.cpp
30@@ -1,15 +1,16 @@
31
32 #include <sqlite_orm/sqlite_orm.h>
33+#include <cstdint>
34 #include <string>
35
36 struct Query {
37 std::string src_ip;
38- uint16_t src_port;
39- uint16_t txn_id;
40- uint32_t tv_sec;
41- uint32_t tv_usec;
42+ std::uint16_t src_port;
43+ std::uint16_t txn_id;
44+ std::uint32_t tv_sec;
45+ std::uint32_t tv_usec;
46 std::string name;
47- uint16_t type;
48+ std::uint16_t type;
49 };
50
51 int main(int, char **) {
52
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb
index ee203f83e2..a4da31ebc7 100644
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb
@@ -1,19 +1,18 @@
1SUMMARY = "SQLite ORM light header only library for modern C++" 1SUMMARY = "SQLite ORM light header only library for modern C++"
2HOMEPAGE = "https://github.com/fnc12/sqlite_orm" 2HOMEPAGE = "https://github.com/fnc12/sqlite_orm"
3LICENSE = "BSD-3-Clause" 3LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5bf5ee8bb16d8e19359efe11bdc3f2" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=4ae09d45eac4aa08d013b5f2e01c67f6"
5 5
6inherit cmake 6inherit cmake
7 7
8DEPENDS += "sqlite3" 8DEPENDS += "sqlite3"
9 9
10SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b" 10SRCREV = "5f1a2ce84a3d72711b4f0a440fdaba977868ae67"
11SRC_URI = " \ 11SRC_URI = " \
12 git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \ 12 git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \
13 file://0001-fix-cstdint-error-with-gcc-15.0.1.patch \
14" 13"
15 14
16EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \ 15EXTRA_OECMAKE += "-DBUILD_TESTING=OFF -DLIB_INSTALL_DIR=${libdir} \
17 -DCMAKE_INSTALL_DIR=${libdir}/cmake \ 16 -DCMAKE_INSTALL_DIR=${libdir}/cmake \
18 -DPKGCONFIG_INSTALL_DIR=${libdir}/pkgconfig" 17 -DPKGCONFIG_INSTALL_DIR=${libdir}/pkgconfig"
19 18