From 13aac19f855bd69730e59f2e2ab400333444db99 Mon Sep 17 00:00:00 2001 From: amibranch Date: Tue, 22 Oct 2024 16:24:18 +0000 Subject: [PATCH] Added improvements, found in review Also removed unnecessary 'cpp' arguments --- meson.build | 12 ++++-------- subprojects/packagefiles/capstone-4.0.2/meson.build | 11 ++++++++--- subprojects/packagefiles/capstone-5.0.1/meson.build | 11 ++++++++--- .../capstone-auto-sync-aarch64/meson.build | 11 ++++++++--- subprojects/packagefiles/capstone-next/meson.build | 11 ++++++++--- subprojects/packagefiles/libmspack/meson.build | 7 ++++--- subprojects/packagefiles/libzip-1.9.2/meson.build | 9 ++++++--- subprojects/packagefiles/lz4-1.9.4/meson.build | 9 ++++++--- subprojects/packagefiles/pcre2/meson.build | 4 ++++ subprojects/packagefiles/rizin-grammar-c/meson.build | 9 +++++++-- .../packagefiles/tree-sitter-0.21.0/meson.build | 9 ++++++--- subprojects/packagefiles/xz-5.2.9/meson.build | 9 ++++++--- subprojects/packagefiles/zlib-1.3.1/meson.build | 7 ++++--- subprojects/rizin-shell-parser/meson.build | 9 ++++++--- subprojects/rzar/meson.build | 4 ++-- subprojects/rzgdb/meson.build | 7 +++++++ subprojects/rzqnx/meson.build | 11 ++++++++--- subprojects/rzwinkd/meson.build | 4 ++-- subprojects/xxhash/meson.build | 9 ++++++--- 19 files changed, 110 insertions(+), 53 deletions(-) diff --git a/meson.build b/meson.build index 16eb29bc5d4..37d2c368a95 100644 --- a/meson.build +++ b/meson.build @@ -81,12 +81,8 @@ endif if cc.has_argument('--std=gnu99') add_project_arguments('--std=gnu99', language: ['c', 'cpp']) - lang_opt = ['c_std=gnu99'] elif cc.has_argument('--std=c99') add_project_arguments('--std=c99', language: ['c', 'cpp']) - lang_opt = ['c_std=c99'] -else - lang_opt = [] endif # Sanitize correct usage of rz_strf() @@ -179,7 +175,7 @@ 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, default_options: lang_opt) +capstone_dep = dependency('capstone', version: '>=4.0.2', required: get_option('use_sys_capstone'), static: is_static_build) if not capstone_dep.found() capstone_version = get_option('use_capstone_version') if fs.is_file('subprojects/capstone-' + capstone_version + '.wrap') @@ -187,7 +183,7 @@ if not capstone_dep.found() 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'] + lang_opt) + capstone_proj = subproject('capstone-' + capstone_version, default_options: ['default_library=static']) else error('Wrong capstone version selected. Please use one of the supported versions.') endif @@ -635,13 +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, default_options: lang_opt) +libzip_dep = dependency('libzip', required: get_option('use_sys_libzip'), static: is_static_build) 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')), - ] + lang_opt) + ]) libzip_dep = libzip_proj.get_variable('libzip_dep') endif diff --git a/subprojects/packagefiles/capstone-4.0.2/meson.build b/subprojects/packagefiles/capstone-4.0.2/meson.build index 15b785d3fd1..3d0d28c7cce 100644 --- a/subprojects/packagefiles/capstone-4.0.2/meson.build +++ b/subprojects/packagefiles/capstone-4.0.2/meson.build @@ -1,11 +1,16 @@ project('capstone', 'c', version: '4.0.2', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', 'arch/AArch64/AArch64Disassembler.c', diff --git a/subprojects/packagefiles/capstone-5.0.1/meson.build b/subprojects/packagefiles/capstone-5.0.1/meson.build index 3281d1aea8b..b6ac8cf6b60 100644 --- a/subprojects/packagefiles/capstone-5.0.1/meson.build +++ b/subprojects/packagefiles/capstone-5.0.1/meson.build @@ -1,11 +1,16 @@ project('capstone', 'c', version: '5.0.1', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', 'arch/AArch64/AArch64Disassembler.c', diff --git a/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build b/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build index ca4d02ccbac..e0b24308867 100644 --- a/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build +++ b/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build @@ -1,11 +1,16 @@ project('capstone', 'c', version: '5.0.1', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', 'arch/AArch64/AArch64Disassembler.c', diff --git a/subprojects/packagefiles/capstone-next/meson.build b/subprojects/packagefiles/capstone-next/meson.build index 2564cdc0a1d..da46836881e 100644 --- a/subprojects/packagefiles/capstone-next/meson.build +++ b/subprojects/packagefiles/capstone-next/meson.build @@ -1,11 +1,16 @@ project('capstone', 'c', version: 'next', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + cs_files = [ 'arch/Alpha/AlphaDisassembler.c', 'arch/Alpha/AlphaInstPrinter.c', diff --git a/subprojects/packagefiles/libmspack/meson.build b/subprojects/packagefiles/libmspack/meson.build index e80d0fce324..fe8e768b4be 100644 --- a/subprojects/packagefiles/libmspack/meson.build +++ b/subprojects/packagefiles/libmspack/meson.build @@ -2,13 +2,14 @@ project('libmspack', 'c', version: '0.10.1alpha', license : 'LGPL2', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) cc = meson.get_compiler('c') +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + # handle libmspack dependency libmspack_files = [ 'libmspack' / 'mspack' / 'cabc.c', diff --git a/subprojects/packagefiles/libzip-1.9.2/meson.build b/subprojects/packagefiles/libzip-1.9.2/meson.build index 44ca85243e8..f21737f060d 100644 --- a/subprojects/packagefiles/libzip-1.9.2/meson.build +++ b/subprojects/packagefiles/libzip-1.9.2/meson.build @@ -2,15 +2,18 @@ project('libzip', 'c', version: '1.9.2', license: 'BSD-3-clause', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) py3_exe = import('python').find_installation() cc = meson.get_compiler('c') is_static_build = get_option('static_runtime') +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + # Create config.h file conf_data = configuration_data() zlib_dep = dependency('zlib', required: get_option('use_sys_zlib'), static: is_static_build) diff --git a/subprojects/packagefiles/lz4-1.9.4/meson.build b/subprojects/packagefiles/lz4-1.9.4/meson.build index cfd1e09927b..0668f35c262 100644 --- a/subprojects/packagefiles/lz4-1.9.4/meson.build +++ b/subprojects/packagefiles/lz4-1.9.4/meson.build @@ -2,11 +2,14 @@ project('lz4', ['c'], license: 'BSD-2-Clause-Patent AND GPL-2.0-or-later', version: '1.9.4', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + lz4_files = [ 'lib/lz4.c', ] diff --git a/subprojects/packagefiles/pcre2/meson.build b/subprojects/packagefiles/pcre2/meson.build index 4b2db66a442..aa3cdf6ce38 100644 --- a/subprojects/packagefiles/pcre2/meson.build +++ b/subprojects/packagefiles/pcre2/meson.build @@ -2,6 +2,10 @@ project('pcre2', 'c', version: '10.44') cc = meson.get_compiler('c') +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + conf_data = configuration_data() pcre2_chartables = configure_file(input : 'src/pcre2_chartables.c.dist', diff --git a/subprojects/packagefiles/rizin-grammar-c/meson.build b/subprojects/packagefiles/rizin-grammar-c/meson.build index 9d275969330..7fda14cca0b 100644 --- a/subprojects/packagefiles/rizin-grammar-c/meson.build +++ b/subprojects/packagefiles/rizin-grammar-c/meson.build @@ -2,11 +2,16 @@ project('rizin-grammar-c', 'c', license: 'MIT', meson_version: '>=0.55.0', default_options: [ - 'c_std=c99', 'werror=false' - ] + ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + ts_c_files = [ 'src/parser.c' ] diff --git a/subprojects/packagefiles/tree-sitter-0.21.0/meson.build b/subprojects/packagefiles/tree-sitter-0.21.0/meson.build index 636c61f313f..89282664392 100644 --- a/subprojects/packagefiles/tree-sitter-0.21.0/meson.build +++ b/subprojects/packagefiles/tree-sitter-0.21.0/meson.build @@ -1,13 +1,16 @@ project('tree-sitter', 'c', license: 'MIT', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) cc = meson.get_compiler('c') +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + tree_sitter_path = 'tree-sitter' tree_sitter_files = ['lib/src/lib.c'] diff --git a/subprojects/packagefiles/xz-5.2.9/meson.build b/subprojects/packagefiles/xz-5.2.9/meson.build index 9af95012459..896bccb4824 100644 --- a/subprojects/packagefiles/xz-5.2.9/meson.build +++ b/subprojects/packagefiles/xz-5.2.9/meson.build @@ -3,13 +3,16 @@ project('liblzma', 'c', version : '5.4.3', license : ['PD', 'LGPL2', 'GPL2', 'GPL3'], meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) cc = meson.get_compiler('c') +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + lzma_cflags = ['-DHAVE_CONFIG_H', '-DTUKLIB_SYMBOL_PREFIX=lzma_', '-DLZMA_API_STATIC'] cdata = configuration_data() diff --git a/subprojects/packagefiles/zlib-1.3.1/meson.build b/subprojects/packagefiles/zlib-1.3.1/meson.build index c1ab0e0217a..d38f116b6d9 100644 --- a/subprojects/packagefiles/zlib-1.3.1/meson.build +++ b/subprojects/packagefiles/zlib-1.3.1/meson.build @@ -2,13 +2,14 @@ project('zlib', 'c', version : '1.3.1', license : 'zlib', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) cc = meson.get_compiler('c') +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + link_args = [] compile_args = [] if cc.get_argument_syntax() == 'msvc' diff --git a/subprojects/rizin-shell-parser/meson.build b/subprojects/rizin-shell-parser/meson.build index 3b310b38982..5ddc26ad3dd 100644 --- a/subprojects/rizin-shell-parser/meson.build +++ b/subprojects/rizin-shell-parser/meson.build @@ -1,11 +1,14 @@ project('rizin-shell-parser', 'c', license: 'LGPL-3.0-only', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + tree_sitter_dep = dependency('tree-sitter') grammar_js = files('grammar.js') tree_sitter_wrap_py = files('meson_tree_sitter_generate.py') diff --git a/subprojects/rzar/meson.build b/subprojects/rzar/meson.build index 7ea195577de..89c799b45da 100644 --- a/subprojects/rzar/meson.build +++ b/subprojects/rzar/meson.build @@ -11,9 +11,9 @@ ar_files = [ cc = meson.get_compiler('c') if cc.has_argument('--std=gnu99') - add_project_arguments('--std=gnu99', language: ['c', 'cpp']) + add_project_arguments('--std=gnu99', language: ['c']) elif cc.has_argument('--std=c99') - add_project_arguments('--std=c99', language: ['c', 'cpp']) + add_project_arguments('--std=c99', language: ['c']) endif rz_util_dep = dependency('rz_util') diff --git a/subprojects/rzgdb/meson.build b/subprojects/rzgdb/meson.build index 9d3e67b835d..30425452222 100644 --- a/subprojects/rzgdb/meson.build +++ b/subprojects/rzgdb/meson.build @@ -1,5 +1,12 @@ project('rzw32dbg_wrap', 'c') +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif gdb_files = [ 'src/arch.c', diff --git a/subprojects/rzqnx/meson.build b/subprojects/rzqnx/meson.build index 418d829c143..1cd2377638c 100644 --- a/subprojects/rzqnx/meson.build +++ b/subprojects/rzqnx/meson.build @@ -1,11 +1,16 @@ project('rzqnx', 'c', license: 'GPL-2.0-only', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=gnu99') + add_project_arguments('--std=gnu99', language: ['c']) +elif cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + qnx_files = [ 'src/core.c', 'src/packet.c', diff --git a/subprojects/rzwinkd/meson.build b/subprojects/rzwinkd/meson.build index 4d27a66f23d..fcec9be6602 100644 --- a/subprojects/rzwinkd/meson.build +++ b/subprojects/rzwinkd/meson.build @@ -14,9 +14,9 @@ winkd_files = [ ] if cc.has_argument('--std=gnu99') - add_project_arguments('--std=gnu99', language: ['c', 'cpp']) + add_project_arguments('--std=gnu99', language: ['c']) elif cc.has_argument('--std=c99') - add_project_arguments('--std=c99', language: ['c', 'cpp']) + add_project_arguments('--std=c99', language: ['c']) endif winkd_inc = [include_directories('.')] diff --git a/subprojects/xxhash/meson.build b/subprojects/xxhash/meson.build index 65e4d5e9066..51417eed228 100644 --- a/subprojects/xxhash/meson.build +++ b/subprojects/xxhash/meson.build @@ -3,11 +3,14 @@ project('xxhash', 'c', version : '0.6.5', license: 'BSD-2-Clause AND GPL-2.0-or-later', meson_version: '>=0.55.0', - default_options: [ - 'c_std=c99', - ] ) +cc = meson.get_compiler('c') + +if cc.has_argument('--std=c99') + add_project_arguments('--std=c99', language: ['c']) +endif + inc = include_directories('.') libxxhash = library('xxhash',