diff --git a/meson.build b/meson.build index 59edbcb7445..3198d8a2c78 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('rizin', 'c', version: 'v0.8.0', - license: 'LGPL3', + license: 'LGPL-3.0-only', meson_version: '>=0.57.0', default_options: [ 'buildtype=debugoptimized', @@ -80,14 +80,14 @@ if is_static_build endif if cc.has_argument('--std=gnu99') - add_global_arguments('--std=gnu99', language: ['c', 'cpp']) + add_project_arguments('--std=gnu99', language: ['c', 'cpp']) elif cc.has_argument('--std=c99') - add_global_arguments('--std=c99', language: ['c', 'cpp']) + add_project_arguments('--std=c99', language: ['c', 'cpp']) endif # Sanitize correct usage of rz_strf() if cc.has_argument('-Werror=sizeof-pointer-memaccess') - add_global_arguments('-Werror=sizeof-pointer-memaccess', language: ['c', 'cpp']) + add_project_arguments('-Werror=sizeof-pointer-memaccess', language: ['c', 'cpp']) endif if cc.has_argument('-Wimplicit-fallthrough=3') @@ -106,16 +106,16 @@ endif if get_option('default_library') == 'shared' if cc.has_argument('-fvisibility=hidden') - add_global_arguments('-fvisibility=hidden', language: 'c') + add_project_arguments('-fvisibility=hidden', language: 'c') endif endif add_project_arguments(['-DRZ_PLUGIN_INCORE=1'], language: 'c') b_sanitize_opt = get_option('b_sanitize') if (b_sanitize_opt.contains('address') or b_sanitize_opt.contains('undefined')) and cc.get_id() == 'clang' - add_global_arguments('-shared-libasan', language: 'c') + add_project_arguments('-shared-libasan', language: 'c') add_global_link_arguments('-shared-libasan', language: 'c') - add_global_arguments('-shared-libasan', language: 'c', native: true) + add_project_arguments('-shared-libasan', language: 'c', native: true) add_global_link_arguments('-shared-libasan', language: 'c', native: true) endif diff --git a/subprojects/nettle/meson.build b/subprojects/nettle/meson.build index ff102850a96..52dcc11ca04 100644 --- a/subprojects/nettle/meson.build +++ b/subprojects/nettle/meson.build @@ -1,5 +1,5 @@ project('nettle', 'c', - license: [ 'LGPL'], + license: 'LGPL', version: '3.7.3' ) # https://git.lysator.liu.se/nettle/nettle diff --git a/subprojects/packagefiles/blake3/meson.build b/subprojects/packagefiles/blake3/meson.build index c1c83905f2b..0e9c4c69c3b 100644 --- a/subprojects/packagefiles/blake3/meson.build +++ b/subprojects/packagefiles/blake3/meson.build @@ -1,4 +1,11 @@ -project('blake3', 'c', version: '1.3.1', license : ['CC0-1.0'], meson_version: '>=0.55.0') +project('blake3', 'c', + version: '1.3.1', + license: 'CC0-1.0', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cc = meson.get_compiler('c') diff --git a/subprojects/packagefiles/capstone-4.0.2/meson.build b/subprojects/packagefiles/capstone-4.0.2/meson.build index 1d3d10516bd..15b785d3fd1 100644 --- a/subprojects/packagefiles/capstone-4.0.2/meson.build +++ b/subprojects/packagefiles/capstone-4.0.2/meson.build @@ -1,4 +1,10 @@ -project('capstone', 'c', version: '4.0.2', meson_version: '>=0.55.0') +project('capstone', 'c', + version: '4.0.2', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', diff --git a/subprojects/packagefiles/capstone-5.0.1/meson.build b/subprojects/packagefiles/capstone-5.0.1/meson.build index 8baa78fa562..3281d1aea8b 100644 --- a/subprojects/packagefiles/capstone-5.0.1/meson.build +++ b/subprojects/packagefiles/capstone-5.0.1/meson.build @@ -1,4 +1,10 @@ -project('capstone', 'c', version: '5.0.1', meson_version: '>=0.55.0') +project('capstone', 'c', + version: '5.0.1', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', diff --git a/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build b/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build index 64318608e4e..ca4d02ccbac 100644 --- a/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build +++ b/subprojects/packagefiles/capstone-auto-sync-aarch64/meson.build @@ -1,4 +1,10 @@ -project('capstone', 'c', version: '5.0.1', meson_version: '>=0.55.0') +project('capstone', 'c', + version: '5.0.1', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cs_files = [ 'arch/AArch64/AArch64BaseInfo.c', diff --git a/subprojects/packagefiles/capstone-next/meson.build b/subprojects/packagefiles/capstone-next/meson.build index 8fbd1488a85..2564cdc0a1d 100644 --- a/subprojects/packagefiles/capstone-next/meson.build +++ b/subprojects/packagefiles/capstone-next/meson.build @@ -1,4 +1,10 @@ -project('capstone', 'c', version: 'next', meson_version: '>=0.55.0') +project('capstone', 'c', + version: 'next', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cs_files = [ 'arch/Alpha/AlphaDisassembler.c', diff --git a/subprojects/packagefiles/libmspack/meson.build b/subprojects/packagefiles/libmspack/meson.build index 8cc94d7f8ab..e80d0fce324 100644 --- a/subprojects/packagefiles/libmspack/meson.build +++ b/subprojects/packagefiles/libmspack/meson.build @@ -1,4 +1,11 @@ -project('libmspack', 'c', version: '0.10.1alpha', license : ['LGPL2'], meson_version: '>=0.55.0') +project('libmspack', 'c', + version: '0.10.1alpha', + license : 'LGPL2', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cc = meson.get_compiler('c') diff --git a/subprojects/packagefiles/libzip-1.9.2/meson.build b/subprojects/packagefiles/libzip-1.9.2/meson.build index 911bb9d6976..44ca85243e8 100644 --- a/subprojects/packagefiles/libzip-1.9.2/meson.build +++ b/subprojects/packagefiles/libzip-1.9.2/meson.build @@ -1,5 +1,11 @@ project('libzip', 'c', - version: '1.9.2') + 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') diff --git a/subprojects/packagefiles/lz4-1.9.4/meson.build b/subprojects/packagefiles/lz4-1.9.4/meson.build index d7c94b657ac..cfd1e09927b 100644 --- a/subprojects/packagefiles/lz4-1.9.4/meson.build +++ b/subprojects/packagefiles/lz4-1.9.4/meson.build @@ -1,7 +1,11 @@ project('lz4', ['c'], - license: ['BSD', 'GPLv2'], + license: 'BSD-2-Clause-Patent AND GPL-2.0-or-later', version: '1.9.4', - meson_version: '>=0.47.0') + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) lz4_files = [ 'lib/lz4.c', diff --git a/subprojects/packagefiles/rizin-grammar-c/meson.build b/subprojects/packagefiles/rizin-grammar-c/meson.build index 859131d859b..9d275969330 100644 --- a/subprojects/packagefiles/rizin-grammar-c/meson.build +++ b/subprojects/packagefiles/rizin-grammar-c/meson.build @@ -1,4 +1,11 @@ -project('rizin-grammar-c', 'c', default_options: ['werror=false']) +project('rizin-grammar-c', 'c', + license: 'MIT', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + 'werror=false' + ] +) 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 8b4af7e5d26..636c61f313f 100644 --- a/subprojects/packagefiles/tree-sitter-0.21.0/meson.build +++ b/subprojects/packagefiles/tree-sitter-0.21.0/meson.build @@ -1,4 +1,10 @@ -project('tree-sitter', 'c') +project('tree-sitter', 'c', + license: 'MIT', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cc = meson.get_compiler('c') diff --git a/subprojects/packagefiles/xz-5.2.9/meson.build b/subprojects/packagefiles/xz-5.2.9/meson.build index bc0d7b5cde1..68b01c177fe 100644 --- a/subprojects/packagefiles/xz-5.2.9/meson.build +++ b/subprojects/packagefiles/xz-5.2.9/meson.build @@ -1,7 +1,12 @@ # liblzma is what upstream uses for their pkg-config name project('liblzma', 'c', version : '5.2.9', - license : 'pd/lgpl2/gpl2/gpl3',) + license : ['PD', 'LGPL2', 'GPL2', 'GPL3'], + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cc = meson.get_compiler('c') diff --git a/subprojects/packagefiles/zlib-1.3.1/meson.build b/subprojects/packagefiles/zlib-1.3.1/meson.build index 528f73a41b8..c1ab0e0217a 100644 --- a/subprojects/packagefiles/zlib-1.3.1/meson.build +++ b/subprojects/packagefiles/zlib-1.3.1/meson.build @@ -1,4 +1,11 @@ -project('zlib', 'c', version : '1.3.1', license : 'zlib') +project('zlib', 'c', + version : '1.3.1', + license : 'zlib', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) cc = meson.get_compiler('c') diff --git a/subprojects/rizin-shell-parser/meson.build b/subprojects/rizin-shell-parser/meson.build index 00055e25125..3b310b38982 100644 --- a/subprojects/rizin-shell-parser/meson.build +++ b/subprojects/rizin-shell-parser/meson.build @@ -1,5 +1,9 @@ project('rizin-shell-parser', 'c', - license : [ 'LGPL'] + license: 'LGPL-3.0-only', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] ) tree_sitter_dep = dependency('tree-sitter') diff --git a/subprojects/rzar/meson.build b/subprojects/rzar/meson.build index 411e0d91e81..3889b1e6073 100644 --- a/subprojects/rzar/meson.build +++ b/subprojects/rzar/meson.build @@ -1,5 +1,9 @@ project('rzar', 'c', - license : [ 'LGPL'] + license: 'LGPL-3.0-only', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] ) # handle ar dependency diff --git a/subprojects/rzqnx/meson.build b/subprojects/rzqnx/meson.build index 500c4feb8d6..418d829c143 100644 --- a/subprojects/rzqnx/meson.build +++ b/subprojects/rzqnx/meson.build @@ -1,5 +1,9 @@ project('rzqnx', 'c', - license : [ 'GPL'] + license: 'GPL-2.0-only', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] ) qnx_files = [ diff --git a/subprojects/rzwinkd/meson.build b/subprojects/rzwinkd/meson.build index 6e869da632d..201cc1c686c 100644 --- a/subprojects/rzwinkd/meson.build +++ b/subprojects/rzwinkd/meson.build @@ -1,5 +1,9 @@ project('rzwinkd', 'c', - license : [ 'LGPL'] + license: 'LGPL-3.0-only', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] ) cc = meson.get_compiler('c') diff --git a/subprojects/xxhash/meson.build b/subprojects/xxhash/meson.build index 4e53b58b6c9..65e4d5e9066 100644 --- a/subprojects/xxhash/meson.build +++ b/subprojects/xxhash/meson.build @@ -1,7 +1,12 @@ project('xxhash', 'c', - # library files are BSD licensed. xxhsum utility is GPL licensed. - license : [ 'BSD', 'GPL'], - version : '0.6.5') + # library files are BSD licensed. xxhsum utility is GPL licensed. + version : '0.6.5', + license: 'BSD-2-Clause AND GPL-2.0-or-later', + meson_version: '>=0.55.0', + default_options: [ + 'c_std=c99', + ] +) inc = include_directories('.') @@ -13,4 +18,4 @@ libxxhash = library('xxhash', xxhash_dep = declare_dependency( include_directories : inc, - link_with : libxxhash) \ No newline at end of file + link_with : libxxhash)