Skip to content

Commit

Permalink
Fixups for the c_std-options
Browse files Browse the repository at this point in the history
Also removed an arg that is not allowed in muon and ignored by meson
  • Loading branch information
amibranch committed Oct 20, 2024
1 parent 452f0b3 commit d24d339
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@ cmake_package_relative_path = run_command(py3_exe, cmake_package_prefix_dir_py,
subproject_clean_error_msg = 'Subprojects are not updated. Please run `git clean -dxff subprojects/` to delete all local subprojects directories. If you want to compile against current subprojects then set option `subprojects_check=false`.'

# handle capstone dependency
capstone_dep = dependency('capstone', version: '>=4.0.2', required: get_option('use_sys_capstone'), static: is_static_build)
capstone_dep = dependency('capstone', version: '>=4.0.2', required: get_option('use_sys_capstone'), static: is_static_build, default_options: ['c_std=gnu99,c99'])
if not capstone_dep.found()
capstone_version = get_option('use_capstone_version')
if fs.is_file('subprojects/capstone-' + capstone_version + '.wrap')
r = run_command(py3_exe, check_meson_subproject_py, 'capstone-' + capstone_version, check: false)
if r.returncode() == 1 and get_option('subprojects_check')
error(subproject_clean_error_msg)
endif
capstone_proj = subproject('capstone-' + capstone_version, default_options: ['default_library=static'])
capstone_proj = subproject('capstone-' + capstone_version, default_options: ['default_library=static', 'c_std=gnu99,c99'])
else
error('Wrong capstone version selected. Please use one of the supported versions.')
endif
Expand Down Expand Up @@ -355,7 +355,7 @@ foreach it : ccs
have_pthread = it_th.found() and it_machine.system() != 'windows'
if it_machine.system() == 'sunos'
# workaround for Solaris until https://github.com/mesonbuild/meson/issues/4328 is fixed
it_mth = declare_dependency(link_args: '-lm', native: it_native)
it_mth = declare_dependency(link_args: '-lm')
else
it_mth = it_cc.find_library('m', required: false, static: is_static_build)
endif
Expand Down Expand Up @@ -631,12 +631,13 @@ if r.returncode() == 1 and get_option('subprojects_check')
error(subproject_clean_error_msg)
endif

libzip_dep = dependency('libzip', required: get_option('use_sys_libzip'), static: is_static_build)
libzip_dep = dependency('libzip', required: get_option('use_sys_libzip'), static: is_static_build, default_options: [ 'c_std=gnu99,c99' ])
if not libzip_dep.found()
libzip_proj = subproject('libzip', default_options: [
'default_library=static',
'static_runtime=@0@'.format(is_static_build),
'use_sys_openssl=@0@'.format(get_option('use_sys_libzip_openssl')),
'c_std=gnu99,c99',
])
libzip_dep = libzip_proj.get_variable('libzip_dep')
endif
Expand Down
2 changes: 1 addition & 1 deletion subprojects/rzar/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project('rzar', 'c',
license: 'LGPL-3.0-only',
meson_version: '>=0.55.0',
default_options: [
'c_std=c99',
'c_std=gnu99,c99',
]
)

Expand Down
2 changes: 1 addition & 1 deletion subprojects/rzwinkd/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project('rzwinkd', 'c',
license: 'LGPL-3.0-only',
meson_version: '>=0.55.0',
default_options: [
'c_std=c99',
'c_std=gnu99,c99',
]
)

Expand Down

0 comments on commit d24d339

Please sign in to comment.