Skip to contentSkip to conversation

nlohmann-json: Upgrade 3.11.3 -> 3.12.0

PATCH Superseded [email protected] 3 participants 3 messages Apr 27, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nlohmann-json: Upgrade 3.11.3 -> 3.12.0

From: Mingli Yu <[email protected]>

License-Update:
Copyright year updated to 2025

 # ./run-ptest
PASS: test-algorithms_cpp11
PASS: test-allocator_cpp11
PASS: test-alt-string_cpp11
PASS: test-assert_macro_cpp11
PASS: test-binary_formats_cpp11
PASS: test-bjdata_cpp11
PASS: test-bson_cpp11
PASS: test-byte_container_with_subtype_cpp11
PASS: test-capacity_cpp11
PASS: test-cbor_cpp11
PASS: test-class_const_iterator_cpp11
PASS: test-class_iterator_cpp11
PASS: test-class_lexer_cpp11
PASS: test-class_parser_cpp11
[snip]
---
 .../{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/nlohmann-json/{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb} (81%)
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +4 -4
similarity index 81%
rename from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
rename to meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..0064a3e726 100644
@@ -2,16 +2,16 @@ SUMMARY = "JSON for modern C++"
 HOMEPAGE = "https://nlohmann.github.io/json/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588"
+LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 
 CVE_PRODUCT = "json-for-modern-cpp"
 
-SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
+SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;branch=master;protocol=https \
            git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
            file://run-ptest \
 "
 
-SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV = "55f93686c01528224f448c19128836e7df245f72"
 SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 
 SRCREV_FORMAT .= "_json-test-data"
@@ -25,7 +25,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
 # nlohmann-json is a header only C++ library, so the main package will be empty.
 ALLOW_EMPTY:${PN} = "1"
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:${PN}-ptest = "perl"
+RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
 
 BBCLASSEXTEND = "native nativesdk"
 
Signature · 1 line
2.34.1
#1 lore raw
Quoted 36 lines · Mingli via lists.openembedded.org

From: Mingli Yu <[email protected]>

License-Update:
Copyright year updated to 2025

 # ./run-ptest
PASS: test-algorithms_cpp11
PASS: test-allocator_cpp11
PASS: test-alt-string_cpp11
PASS: test-assert_macro_cpp11
PASS: test-binary_formats_cpp11
PASS: test-bjdata_cpp11
PASS: test-bson_cpp11
PASS: test-byte_container_with_subtype_cpp11
PASS: test-capacity_cpp11
PASS: test-cbor_cpp11
PASS: test-class_const_iterator_cpp11
PASS: test-class_iterator_cpp11
PASS: test-class_lexer_cpp11
PASS: test-class_parser_cpp11
[snip]
---
 .../{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/nlohmann-json/{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb} (81%)
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +0 -0
similarity index 81%
rename from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
rename to meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..0064a3e726 100644

meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb SUMMARY = "JSON for modern C++" · line 9

Quoted 10 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +2 -2
@@ -2,16 +2,16 @@ SUMMARY = "JSON for modern C++"
 HOMEPAGE = "https://nlohmann.github.io/json/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588"
+LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 
 CVE_PRODUCT = "json-for-modern-cpp"
 
-SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
+SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;branch=master;protocol=https \

This seems to have 2 branches in the URI.

Quoted 27 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +2 -3
            git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
            file://run-ptest \
 "
 
-SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV = "55f93686c01528224f448c19128836e7df245f72"
 SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 
 SRCREV_FORMAT .= "_json-test-data"
@@ -25,7 +25,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
 # nlohmann-json is a header only C++ library, so the main package will be empty.
 ALLOW_EMPTY:${PN} = "1"
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:${PN}-ptest = "perl"
+RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
 
 BBCLASSEXTEND = "native nativesdk"
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#117166): https://lists.openembedded.org/g/openembedded-devel/message/117166
Mute This Topic: https://lists.openembedded.org/mt/112480376/6084445
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

It still fails ptests on musl systems.

Quoted 81 lines · Gyorgy Sarvari via lists.openembedded.org
Quoted 36 lines · Mingli via lists.openembedded.org

From: Mingli Yu <[email protected]>

License-Update:
Copyright year updated to 2025

 # ./run-ptest
PASS: test-algorithms_cpp11
PASS: test-allocator_cpp11
PASS: test-alt-string_cpp11
PASS: test-assert_macro_cpp11
PASS: test-binary_formats_cpp11
PASS: test-bjdata_cpp11
PASS: test-bson_cpp11
PASS: test-byte_container_with_subtype_cpp11
PASS: test-capacity_cpp11
PASS: test-cbor_cpp11
PASS: test-class_const_iterator_cpp11
PASS: test-class_iterator_cpp11
PASS: test-class_lexer_cpp11
PASS: test-class_parser_cpp11
[snip]
---
 .../{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/nlohmann-json/{nlohmann-json_3.11.3.bb => nlohmann-json_3.12.0.bb} (81%)
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +0 -0
similarity index 81%
rename from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
rename to meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..0064a3e726 100644

meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb SUMMARY = "JSON for modern C++" · line 9

Quoted 10 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +2 -2
@@ -2,16 +2,16 @@ SUMMARY = "JSON for modern C++"
 HOMEPAGE = "https://nlohmann.github.io/json/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588"
+LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 
 CVE_PRODUCT = "json-for-modern-cpp"
 
-SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
+SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;branch=master;protocol=https \

This seems to have 2 branches in the URI.

Quoted 13 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +1 -1
            git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
            file://run-ptest \
 "
 
-SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV = "55f93686c01528224f448c19128836e7df245f72"
 SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 
 SRCREV_FORMAT .= "_json-test-data"

meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests= · line 31

Quoted 8 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb +1 -1
@@ -25,7 +25,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
 # nlohmann-json is a header only C++ library, so the main package will be empty.
 ALLOW_EMPTY:${PN} = "1"
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:${PN}-ptest = "perl"
+RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
 
 BBCLASSEXTEND = "native nativesdk"
 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#117167): https://lists.openembedded.org/g/openembedded-devel/message/117167
Mute This Topic: https://lists.openembedded.org/mt/112480376/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-