| commit | dce5cf9dceda684d40fb0e9686ba884ed6b0751f | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <geissonator@yahoo.com> | Sun May 17 11:54:15 2020 -0500 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Thu May 21 15:43:47 2020 -0500 |
| tree | 5b7b710f260f5159654b929c3745cdd65fb4a377 | |
| parent | 9f17c411648a900222911d48cd4d36777acbb1aa [diff] [blame] |
nlohmann-json: backport gcc10 fix The following issue and PR describe an issue with nlohmann-json and GCC10. https://github.com/nlohmann/json/issues/1920 https://github.com/nlohmann/json/pull/2034 Confirmed that this fixed the issue seen in OpenBMC when pulling in the latest upstream meta-openembedded. Change-Id: I92f641bf4859708fbf78d78448e16c39577a2e39 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb index 86fe673..5766194 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb
@@ -4,7 +4,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1" +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ + file://0001-Templatize-basic_json-ctor-from-json_ref.patch \ + file://0001-typo-fix.patch \ + " SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4"