summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2025-04-28 15:57:18 +0800
committerKhem Raj <raj.khem@gmail.com>2025-04-28 07:02:49 -0700
commit0b7351142e2b1ff00617506a3e94c7a23ef91125 (patch)
tree598444f7768425aa0c93e8af26c128dd1d078bbb /meta-oe
parent3adc396a6fbc036835de6844bec5270ceffab59e (diff)
downloadmeta-openembedded-0b7351142e2b1ff00617506a3e94c7a23ef91125.tar.gz
nlohmann-json: Upgrade 3.11.3 -> 3.12.0
* License-Update: Copyright year updated to 2025 * It seems snprintf in glibc is locale-aware. And it will format floating-point numbers according to the locale when the numeric locale is set (e.g., de_DE). But in musl, snprintf does not respect locale settings for number formatting. It will always use a period as the decimal separator regardless of the locale set. So exclude TEST CASE "locale-dependent test (LC_NUMERIC=de_DE)" [1] right now and add the case back once the issue resolved by upstream. # ./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] [1] https://github.com/nlohmann/json/issues/4767 Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rwxr-xr-xmeta-oe/recipes-devtools/nlohmann-json/files/run-ptest6
-rw-r--r--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)8
2 files changed, 9 insertions, 5 deletions
diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
index 2f00267d50..d39ee6df8f 100755
--- a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
+++ b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
@@ -3,7 +3,11 @@
3cd tests 3cd tests
4for atest in test-* ; do 4for atest in test-* ; do
5 rm -rf tests.log 5 rm -rf tests.log
6 ./${atest} > tests.log 2>&1 6 if [ ${atest} = "test-locale-cpp_cpp11" ]; then
7 ./${atest} --test-case-exclude="locale-dependent test (LC_NUMERIC=de_DE)" > tests.log 2>&1
8 else
9 ./${atest} > tests.log 2>&1
10 fi
7 if [ $? = 0 ] ; then 11 if [ $? = 0 ] ; then
8 echo "PASS: ${atest}" 12 echo "PASS: ${atest}"
9 else 13 else
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..58567a781e 100644
--- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
+++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
@@ -2,16 +2,16 @@ SUMMARY = "JSON for modern C++"
2HOMEPAGE = "https://nlohmann.github.io/json/" 2HOMEPAGE = "https://nlohmann.github.io/json/"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588" 5LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
6 6
7CVE_PRODUCT = "json-for-modern-cpp" 7CVE_PRODUCT = "json-for-modern-cpp"
8 8
9SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \ 9SRC_URI = "git://github.com/nlohmann/json.git;branch=master;protocol=https \
10 git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \ 10 git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
11 file://run-ptest \ 11 file://run-ptest \
12" 12"
13 13
14SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" 14SRCREV = "55f93686c01528224f448c19128836e7df245f72"
15SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37" 15SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
16 16
17SRCREV_FORMAT .= "_json-test-data" 17SRCREV_FORMAT .= "_json-test-data"
@@ -25,7 +25,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
25# nlohmann-json is a header only C++ library, so the main package will be empty. 25# nlohmann-json is a header only C++ library, so the main package will be empty.
26ALLOW_EMPTY:${PN} = "1" 26ALLOW_EMPTY:${PN} = "1"
27RDEPENDS:${PN}-dev = "" 27RDEPENDS:${PN}-dev = ""
28RDEPENDS:${PN}-ptest = "perl" 28RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
29 29
30BBCLASSEXTEND = "native nativesdk" 30BBCLASSEXTEND = "native nativesdk"
31 31