| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 06240574626eb21af37cf7dde5bf81e892dff467 Mon Sep 17 00:00:00 2001 |
| 2 | From: Emmanuele Bassi <ebassi@gnome.org> |
| 3 | Date: Wed, 5 Oct 2022 22:15:37 +0100 |
| 4 | Subject: [PATCH] build: Use the appropriate dependency object |
| 5 | |
| 6 | Just using `link_with` will not ensure that the GOA web extension shared |
| 7 | module is properly built against libgoa-backend and libgoa; the |
| 8 | generated headers must be transitively available by the time we build |
| 9 | the shared module. |
| 10 | |
| 11 | Fixes: #226 |
| 12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/fe86bfb0271735c8130367c46536b08dad5c20d8] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | src/goabackend/meson.build | 3 +-- |
| 16 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build |
| 19 | index f5382b3..865b2d2 100644 |
| 20 | --- a/src/goabackend/meson.build |
| 21 | +++ b/src/goabackend/meson.build |
| 22 | @@ -157,9 +157,8 @@ libgoa_web_extension = shared_module( |
| 23 | 'goawebextension', |
| 24 | libgoawebextension_sources, |
| 25 | include_directories: common_incs + [goa_inc], |
| 26 | - dependencies: deps, |
| 27 | + dependencies: [deps, libgoa_backend_dep], |
| 28 | c_args: cflags, |
| 29 | - link_with: libgoa_backend, |
| 30 | install: true, |
| 31 | install_dir: join_paths(goa_pkglibdir, 'web-extensions') |
| 32 | ) |
| 33 | -- |
| 34 | 2.39.0 |
| 35 | |