diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2022-08-25 21:40:15 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-09-01 01:14:13 +0300 |
| commit | 0be39b350fde000ff84e6da5e4387da5eef050e2 (patch) | |
| tree | 31a5799cd9d19d2e04c519ef58d781283af1ad0f | |
| parent | ac37d615e7d3e9ea973f5e3d60e677678d5c28ac (diff) | |
| download | openbmc-0be39b350fde000ff84e6da5e4387da5eef050e2.tar.xz | |
Remove boost PACKAGECONFIG for class-target
Some BOOST_LIBS such as python and locale are being added by
PACKAGECONFIG. Since we want to limit to the small set of BOOST_LIBS by
default, we can remove anything added by PACKAGECONFIG for class-target.
We found that boost-python is meeting the openssl dependency in the
background, so we also have to add an explicit openssl dependency to
build some applications without boost-python.
This also updates the existing BOOST_LIBS change to only affect
class-target.
Change-Id: I6cd64354ac65ba60b0672a67b9d9e3a7dbe34b01
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
3 files changed, 4 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index 643371947a..af8c6091cd 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -22,6 +22,7 @@ SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.biosconfig_manager.service \ xyz.openbmc_project.biosconfig_password.service" DEPENDS = " boost \ + openssl \ phosphor-dbus-interfaces \ phosphor-logging \ sdbusplus \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 203a64b70d..392226088a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -36,6 +36,7 @@ PACKAGECONFIG[sensors-cache] = "-Dsensors-cache=enabled,-Dsensors-cache=disabled DEPENDS += "nlohmann-json" +DEPENDS += "openssl" DEPENDS += "phosphor-state-manager" DEPENDS += "${@ipmi_whitelists(d)}" DEPENDS += "phosphor-dbus-interfaces" diff --git a/meta-phosphor/recipes-support/boost/boost_%.bbappend b/meta-phosphor/recipes-support/boost/boost_%.bbappend index 7aaa35c695..475c830c7b 100644 --- a/meta-phosphor/recipes-support/boost/boost_%.bbappend +++ b/meta-phosphor/recipes-support/boost/boost_%.bbappend @@ -8,5 +8,6 @@ # #https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#boost # -BOOST_LIBS:openbmc-phosphor = "chrono thread context coroutine" +BOOST_LIBS:openbmc-phosphor:class-target = "chrono thread context coroutine" +PACKAGECONFIG:openbmc-phosphor:class-target = "" |