[rhythmbox/wip/jtojnar/libxml-build-fix] rhythmdb: Fix build




commit 7e8c7b803a45b7badf350132f8e78e3d75b99a21
Author: Jan Tojnar <jtojnar gmail com>
Date:   Mon May 2 21:24:53 2022 +0200

    rhythmdb: Fix build
    
    rhythmdb.h includes librb and libxml but those were not exposed
    as dependencies in rhythmdb_dep, leading to a build failure on Nix:
    
            FAILED: shell/librhythmbox-core.so.10.0.0.p/rb-history.c.o
            [...]
            In file included from ../shell/rb-history.h:29,
                             from ../shell/rb-history.c:33:
            ../rhythmdb/rhythmdb.h:35:10: fatal error: libxml/tree.h: No such file or directory
               35 | #include <libxml/tree.h>
                  |          ^~~~~~~~~~~~~~~

 rhythmdb/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rhythmdb/meson.build b/rhythmdb/meson.build
index 1a91cf6c0..206ea7581 100644
--- a/rhythmdb/meson.build
+++ b/rhythmdb/meson.build
@@ -40,11 +40,14 @@ if use_no_strict_aliasing
   c_args += ['-fno-strict-aliasing']
 endif
 
-rhythmdb_dependencies = [libmath]
+rhythmdb_dependencies = [
+  libmath,
+  librb_dep,
+]
 
 librhythmdb = static_library('rhythmdb', rhythmdb_sources,
   c_args: c_args,
-  dependencies: [rhythmdb_dependencies, librb_dep],
+  dependencies: rhythmdb_dependencies,
   include_directories: [podcastinc, widgetsinc])
 
 rhythmdb_dep = declare_dependency(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]