diff mbox series

[meta-oe] valijson: move out of hard dep on meta-networking

Message ID 20220322175013.3378960-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] valijson: move out of hard dep on meta-networking | expand

Commit Message

Khem Raj March 22, 2022, 5:50 p.m. UTC 
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>
---
 .../packagegroups/packagegroup-meta-oe.bbappend             | 4 ----
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb  | 1 +
 .../recipes-devtools/valijson/valijson_0.6.bb               | 6 ++++--
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename meta-oe/{dynamic-layers/networking-layer => }/recipes-devtools/valijson/valijson_0.6.bb (81%)
diff mbox series

Patch

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 359067cda3..b71b7e4f8a 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 @@ 
-RDEPENDS:packagegroup-meta-oe-devtools += "\
-    valijson \
-"
-
 RDEPENDS:packagegroup-meta-oe-support:append:x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}"
 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 52a82e8acd..a74fe0e9d0 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 ="\
     squashfs-tools-ng \
     uftrace \
     unifex \
+    valijson \
     libxerces-c \
     xerces-c-samples \
     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
similarity index 81%
rename from meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb
rename to meta-oe/recipes-devtools/valijson/valijson_0.6.bb
index 1d3daa1443..4bed4a4f10 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"
 
 inherit cmake
 
-EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0"
+PACKAGECONFIG ?= "boost"
 
-DEPENDS = "curlpp"
+PACKAGECONFIG[boost] = "-Dvalijson_EXCLUDE_BOOST=FALSE,-Dvalijson_EXCLUDE_BOOST=TRUE,boost"
+PACKAGECONFIG[examples] = "-Dvalijson_BUILD_EXAMPLES=TRUE,-Dvalijson_BUILD_EXAMPLES=FALSE,curlpp"
+PACKAGECONFIG[tests] = "-Dvalijson_BUILD_TESTS=TRUE,-Dvalijson_BUILD_TESTS=FALSE,curlpp"
 
 # valijson is a header only C++ library, so the main package will be empty.
 RDEPENDS:${PN}-dev = ""