commit 26ed4a1ee54f77e5476cb8cfa1c1543eb66e51e7
author Ed Tanous <edtanous@google.com> Wed Jul 13 13:46:08 2022 -0700
committer Ed Tanous <edtanous@google.com> Wed Jul 13 14:04:39 2022 -0700
tree 06ad521def56ce8cb36c50835dc6fc3f02f6021a
parent 82720f07ac561af6c6ceb29e323f3c59d8effd13

Add boost wrap file

Recent changes make us incompatible with older versions of boost (1.74
in my testing).  Like we do elsewhere, add a wrapfile for boost.

At the same time, the tests were missing an explicit #include for boost,
so even when the above patch was applied, it still doesn't build.  Add
an explicit dependency.

Tested:
meson buildlocal --buildtype=debug && ninja -C buildlocal

Succeeds.  Should have no impact to yocto builds.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I20543fd184491dc138a2e145945eb71051c4cd52

meson.build

diff --git a/meson.build b/meson.build
index e86c378..85e2ee0 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,13 @@
 phosphor_logging = dependency('phosphor-logging')
 phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces')
 sdbusplus = dependency('sdbusplus')
-
+boost = dependency('boost', version : '>=1.79.0', required: false, include_type: 'system')
+if not boost.found()
+  subproject('boost', required: false)
+  boost_inc = include_directories('subprojects/boost_1_79_0/', is_system:true)
+  boost  = declare_dependency(include_directories : boost_inc)
+  boost = boost.as_system('system')
+endif
 
 if get_option('buildtype').startswith('debug')
     add_project_arguments('-DMAPPER_ENABLE_DEBUG', language : 'cpp')
@@ -84,7 +90,7 @@
         'src/associations.cpp',
     ],
     dependencies: [
-        dependency('boost'),
+        boost,
         dependency('libsystemd'),
         phosphor_dbus_interfaces,
         phosphor_logging,

src/test/meson.build

diff --git a/src/test/meson.build b/src/test/meson.build
index 183ed88..07ef230 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -14,7 +14,7 @@
   extra_deps = t[1]
   test(name, executable(name.underscorify(), name + '.cpp',
                      implicit_include_directories: false,
-                     dependencies: [gtest, gmock, sdbusplus, extra_deps],
+                     dependencies: [boost, gtest, gmock, sdbusplus, extra_deps],
                      include_directories: ['../..']),
        workdir: meson.current_source_dir())
 endforeach

subprojects/boost.wrap

diff --git a/subprojects/boost.wrap b/subprojects/boost.wrap
new file mode 100644
index 0000000..9d36198
--- /dev/null
+++ b/subprojects/boost.wrap
@@ -0,0 +1,5 @@
+[wrap-file]
+source_url = https://downloads.yoctoproject.org/mirror/sources/boost_1_79_0.tar.bz2
+source_hash = 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
+source_filename = 1_79_0.tar.bz2
+