diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-22 10:44:56 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
commit | 6806ca66066c0aed2ca82a70404ffc196ec64663 (patch) | |
tree | 10d058b625f666c1483b0e9ff6b00d4f716962e5 /meta-oe | |
parent | 8df60dc8d69ffa506fd923f8db91a2a8aa33343f (diff) | |
download | meta-openembedded-6806ca66066c0aed2ca82a70404ffc196ec64663.tar.gz |
valijson: move out of hard dep on meta-networking
curlpp is only needed to build examples, therefore make it a
packageconfig and keep it disabled, which is default anyway
Add packageconfigs for tests and disabling boost as well.
Include boost support by default.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend | 4 | ||||
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/valijson/valijson_0.6.bb (renamed from meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb) | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 359067cda..b71b7e4f8 100644 --- a/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend | |||
@@ -1,6 +1,2 @@ | |||
1 | RDEPENDS:packagegroup-meta-oe-devtools += "\ | ||
2 | valijson \ | ||
3 | " | ||
4 | |||
5 | RDEPENDS:packagegroup-meta-oe-support:append:x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" | 1 | RDEPENDS:packagegroup-meta-oe-support:append:x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" |
6 | RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" | 2 | RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" |
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 52a82e8ac..a74fe0e9d 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -303,6 +303,7 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ | |||
303 | squashfs-tools-ng \ | 303 | squashfs-tools-ng \ |
304 | uftrace \ | 304 | uftrace \ |
305 | unifex \ | 305 | unifex \ |
306 | valijson \ | ||
306 | libxerces-c \ | 307 | libxerces-c \ |
307 | xerces-c-samples \ | 308 | xerces-c-samples \ |
308 | xmlrpc-c \ | 309 | xmlrpc-c \ |
diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb b/meta-oe/recipes-devtools/valijson/valijson_0.6.bb index 1d3daa144..4bed4a4f1 100644 --- a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb +++ b/meta-oe/recipes-devtools/valijson/valijson_0.6.bb | |||
@@ -10,9 +10,11 @@ S = "${WORKDIR}/git" | |||
10 | 10 | ||
11 | inherit cmake | 11 | inherit cmake |
12 | 12 | ||
13 | EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" | 13 | PACKAGECONFIG ?= "boost" |
14 | 14 | ||
15 | DEPENDS = "curlpp" | 15 | PACKAGECONFIG[boost] = "-Dvalijson_EXCLUDE_BOOST=FALSE,-Dvalijson_EXCLUDE_BOOST=TRUE,boost" |
16 | PACKAGECONFIG[examples] = "-Dvalijson_BUILD_EXAMPLES=TRUE,-Dvalijson_BUILD_EXAMPLES=FALSE,curlpp" | ||
17 | PACKAGECONFIG[tests] = "-Dvalijson_BUILD_TESTS=TRUE,-Dvalijson_BUILD_TESTS=FALSE,curlpp" | ||
16 | 18 | ||
17 | # valijson is a header only C++ library, so the main package will be empty. | 19 | # valijson is a header only C++ library, so the main package will be empty. |
18 | RDEPENDS:${PN}-dev = "" | 20 | RDEPENDS:${PN}-dev = "" |