netstar pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=16f3870fb50929602c03955a715e4bff3f4f0fea
commit 16f3870fb50929602c03955a715e4bff3f4f0fea Author: Al Poole <nets...@gmail.com> Date: Tue Dec 19 01:02:53 2017 +0000 meson: fix build on FreeBSD of terminology. The option generated file causes lot of issues when it's included in source files via private.h. Linux needs these but FreeBSD breaks. Other option is to change header inclusion ordering but that is messy. --- meson.build | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index d00fb35..d41747e 100644 --- a/meson.build +++ b/meson.build @@ -26,13 +26,18 @@ config_data.set_quoted('PACKAGE_DATA_DIR', config_data.set_quoted('PACKAGE_LIB_DIR', join_paths(prefix, get_option('libdir'))) config_data.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir'))) -config_data.set('_GNU_SOURCE', 1) -config_data.set('__EXTENSIONS__', 1) -config_data.set('_POSIX_PTHREAD_SEMANTICS', 1) -config_data.set('_TANDEM_SOURCE', 1) -config_data.set('_ALL_SOURCE', 1) -config_data.set('_POSIX_SOURCE', 1) -config_data.set('_POSIX_1_SOURCE', 1) + +host_os = host_machine.system() + +if host_os == 'linux' + config_data.set('_GNU_SOURCE', 1) + config_data.set('__EXTENSIONS__', 1) + config_data.set('_POSIX_PTHREAD_SEMANTICS', 1) + config_data.set('_TANDEM_SOURCE', 1) + config_data.set('_ALL_SOURCE', 1) + config_data.set('_POSIX_SOURCE', 1) + config_data.set('_POSIX_1_SOURCE', 1) +endif efl_version = '1.8.0' efl_deps = ['edje', @@ -58,6 +63,7 @@ edj_files = [] if get_option('nls') == true subdir('po') + terminology_dependencies += cc.find_library('intl', required: false) endif foreach efl_dep: efl_deps --