subprojects: fix wraps
Fixed the missing two wrap files; also simplified meson deps via
`[provide]`.
1. libgpiod; installed from WrapDB; reference:
[1] https://mesonbuild.com/Wrapdb-projects.html
This is also alligned with Yocto; reference:
[1] https://github.com/openbmc/openbmc/blob/78b727985e7571e0b196561e44427690f04d57d9/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb
2. sdbusplus
Tested: builds on systems without the two dependencies where meson
automatically downloads them
Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I81305c3f399fbe437cc8e32015e074eff93078bc
diff --git a/meson.build b/meson.build
index c1cc9b8..24403ad 100644
--- a/meson.build
+++ b/meson.build
@@ -34,11 +34,10 @@
endif
deps = [
- dependency('libgpiodcxx', fallback: ['libgpiod', 'gpiodcxx_dep'], default_options: ['bindings=cxx']),
+ dependency('libgpiodcxx', default_options: ['bindings=cxx']),
dependency('systemd'),
- dependency('sdbusplus', fallback: ['sdbusplus', 'sdbusplus_dep']),
- dependency('phosphor-logging', fallback: ['phosphor-logging', 'phosphor_logging_dep']),
-
+ dependency('sdbusplus'),
+ dependency('phosphor-logging'),
]
executable(
diff --git a/subprojects/libgpiod.wrap b/subprojects/libgpiod.wrap
new file mode 100644
index 0000000..e85aa49
--- /dev/null
+++ b/subprojects/libgpiod.wrap
@@ -0,0 +1,12 @@
+[wrap-file]
+directory = libgpiod-1.6.3
+source_url = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-1.6.3.tar.gz
+source_filename = libgpiod-1.6.3.tar.gz
+source_hash = eb446070be1444fd7d32d32bbca53c2f3bbb0a21193db86198cf6050b7a28441
+patch_filename = libgpiod_1.6.3-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libgpiod_1.6.3-1/get_patch
+patch_hash = 76821c637073679a88f77593c6f7ce65b4b5abf8c998f823fffa13918c8761df
+
+[provide]
+libgpiod = gpiod_dep
+libgpiodcxx = gpiodcxx_dep
diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
index a039fcf..71eee8b 100644
--- a/subprojects/phosphor-logging.wrap
+++ b/subprojects/phosphor-logging.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/phosphor-logging.git
revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep
diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
new file mode 100644
index 0000000..7b076d0
--- /dev/null
+++ b/subprojects/sdbusplus.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep