discomfitor pushed a commit to branch enlightenment-0.22. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4f5598c62df34be63da0e1e8f71d954333de798a
commit 4f5598c62df34be63da0e1e8f71d954333de798a Author: Al Poole <nets...@gmail.com> Date: Fri Dec 15 11:32:17 2017 -0800 build: fix meson build on FreeBSD. Summary: -Dsystemd=false and -Ddevice-udev=false with this. Reviewers: raster, zmike! Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5648 Signed-off-by: Cedric BAIL <ced...@osg.samsung.com> --- meson.build | 2 +- src/bin/e_fm/meson.build | 1 + src/bin/meson.build | 9 +++++---- src/modules/temperature/meson.build | 7 ++++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 76269fe0a..c9a6b532b 100644 --- a/meson.build +++ b/meson.build @@ -213,7 +213,7 @@ if get_option('systemd') == true endif endif -if cc.has_function('eeze_disk_function', dependencies: dependency('eeze')) == true +if host_os.startswith('linux') and cc.has_function('eeze_disk_function', dependencies: dependency('eeze')) == true config_h.set('HAVE_EEZE_MOUNT', '1') eeze_mount = true endif diff --git a/src/bin/e_fm/meson.build b/src/bin/e_fm/meson.build index 8d5796b75..55480bb10 100644 --- a/src/bin/e_fm/meson.build +++ b/src/bin/e_fm/meson.build @@ -1,6 +1,7 @@ deps = [ dep_eina, dep_ecore, + dep_eet, dep_ecore_con, dep_ecore_file, dep_ecore_ipc, diff --git a/src/bin/meson.build b/src/bin/meson.build index 5f903e985..a8f6aa760 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -556,10 +556,11 @@ suid_exes += join_paths(dir_e_utils, 'enlightenment_sys') if freebsd == true executable('enlightenment_ckpasswd', 'e_ckpasswd_main.c', - c_args : suid_cflags, - link_args : suid_ldflags, - install_dir: dir_e_utils, - install : true + dependencies : [ dep_crypt ], + c_args : suid_cflags, + link_args : suid_ldflags, + install_dir : dir_e_utils, + install : true ) suid_exes += join_paths(dir_e_utils, 'enlightenment_ckpasswd') endif diff --git a/src/modules/temperature/meson.build b/src/modules/temperature/meson.build index ade13081c..0846a8654 100644 --- a/src/modules/temperature/meson.build +++ b/src/modules/temperature/meson.build @@ -2,6 +2,11 @@ src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_tempget.c', - 'e_mod_udev.c', 'e_mod_main.h' ) + +if get_option('device-udev') == true + src += files( + 'e_mod_udev.c' + ) +endif --