Skip to content

Commit

Permalink
meson: set GNU99/C99 standard for subprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
XVilka committed Oct 21, 2024
1 parent 2a8b05d commit 8ada452
Show file tree
Hide file tree
Showing 19 changed files with 117 additions and 23 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion subprojects/nettle/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('nettle', 'c',
license: [ 'LGPL'],
license: 'LGPL',
version: '3.7.3'
)
# https://git.lysator.liu.se/nettle/nettle
Expand Down
9 changes: 8 additions & 1 deletion subprojects/packagefiles/blake3/meson.build
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
8 changes: 7 additions & 1 deletion subprojects/packagefiles/capstone-4.0.2/meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
8 changes: 7 additions & 1 deletion subprojects/packagefiles/capstone-5.0.1/meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
8 changes: 7 additions & 1 deletion subprojects/packagefiles/capstone-next/meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
9 changes: 8 additions & 1 deletion subprojects/packagefiles/libmspack/meson.build
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
8 changes: 7 additions & 1 deletion subprojects/packagefiles/libzip-1.9.2/meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
8 changes: 6 additions & 2 deletions subprojects/packagefiles/lz4-1.9.4/meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
9 changes: 8 additions & 1 deletion subprojects/packagefiles/rizin-grammar-c/meson.build
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 7 additions & 1 deletion subprojects/packagefiles/tree-sitter-0.21.0/meson.build
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
7 changes: 6 additions & 1 deletion subprojects/packagefiles/xz-5.2.9/meson.build
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
9 changes: 8 additions & 1 deletion subprojects/packagefiles/zlib-1.3.1/meson.build
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
6 changes: 5 additions & 1 deletion subprojects/rizin-shell-parser/meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
6 changes: 5 additions & 1 deletion subprojects/rzar/meson.build
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion subprojects/rzqnx/meson.build
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
6 changes: 5 additions & 1 deletion subprojects/rzwinkd/meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
13 changes: 9 additions & 4 deletions subprojects/xxhash/meson.build
Original file line number Diff line number Diff line change
@@ -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('.')

Expand All @@ -13,4 +18,4 @@ libxxhash = library('xxhash',

xxhash_dep = declare_dependency(
include_directories : inc,
link_with : libxxhash)
link_with : libxxhash)

0 comments on commit 8ada452

Please sign in to comment.