Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 12:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix FTBFS using meson without valgrind

Browse Source 
Now with meson build system libsecret FTBFS without valgrind installed.
Two issues: (1) egg-testing.c depends on valgrind/valgrind.h unnecessarily;
(2) we forgot to add "build" directory as a header directory for meson.

This commit resolves both of them.
This commit is contained in:
Xi Ruoyao 2019-09-20 23:32:14 +08:00
parent f576dfbe50
commit c4fb5f033f
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
egg/egg-testing.c
View File

@ -27,8 +27,6 @@
#include <glib-object.h> #include <glib-object.h>
#include <valgrind/valgrind.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>

2
egg/meson.build
View File

@ -21,5 +21,5 @@ endif
libegg = static_library('egg', libegg = static_library('egg',
libegg_sources, libegg_sources,
dependencies: libegg_deps, dependencies: libegg_deps,
include_directories: config_h_dir, include_directories: [config_h_dir, build_dir],
) )

1
meson.build
View File

@ -24,6 +24,7 @@ with_gtkdoc = get_option('gtk_doc')
# Some variables # Some variables
config_h_dir = include_directories('.') config_h_dir = include_directories('.')
build_dir = include_directories('build')
libsecret_prefix = get_option('prefix') libsecret_prefix = get_option('prefix')
datadir = get_option('datadir') datadir = get_option('datadir')
includedir = get_option('includedir') includedir = get_option('includedir')