From ae3d8b0bae04cb701e0f70b55216de9a5677ed02 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Wed, 16 Aug 2023 00:04:21 +0200 Subject: [PATCH] Meson: Cleanup bison, flex and ragel modules --- meson.build | 2 +- meson/bison/meson.build | 10 ++++------ meson/flex/meson.build | 10 ++++------ meson/ragel/meson.build | 8 +++----- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build index d0bec45e22..95d1bfcf8b 100644 --- a/meson.build +++ b/meson.build @@ -37,6 +37,7 @@ subdir('meson' / 'timet-size') # Check the size of time_t subdir('meson' / 'timet-sign') # Check the sign of time_t subdir('meson' / 'flex') # Find flex and create generator subdir('meson' / 'bison') # Find bison and create generator +subdir('meson' / 'ragel') # Find ragel and create generator subdir('meson' / 'platform') # Platform detection subdir('meson' / 'atomics') # Check atomics support subdir('meson' / 'pthread-headers') # Check pthread headers @@ -56,7 +57,6 @@ subdir('meson' / 'libssl') # OpenSSL libssl subdir('meson' / 'gnutls') # GnuTLS subdir('meson' / 'dot') # DNS over TLS subdir('meson' / 'ipcipher') # IPCipher -subdir('meson' / 'ragel') # Find Ragel and create generator subdir('meson' / 'clock-gettime') # Clock_gettime subdir('meson' / 'boost') # Boost subdir('meson' / 'boost-program-options') # Boost Program Options Library diff --git a/meson/bison/meson.build b/meson/bison/meson.build index 6801c91c89..9825df8295 100644 --- a/meson/bison/meson.build +++ b/meson/bison/meson.build @@ -1,10 +1,8 @@ -# Find bison -# Outputs: bison - bison = find_program('bison', required: true) -summary('bison', bison.found(), bool_yn: true, section: 'Programs') -# summary('Bison', bison.full_path(), section: 'System') # TODO Meson 0.55 -# summary('Bison Version', bison.version(), section: 'System') # TODO Meson 0.62 + +summary('Bison', bison.found(), bool_yn: true, section: 'Programs') +summary('Bison Path', bison.full_path(), section: 'Programs') +summary('Bison Version', bison.version(), section: 'Programs') bison_generator = generator( bison, diff --git a/meson/flex/meson.build b/meson/flex/meson.build index 3ab0ad3bf5..1ef5905e3e 100644 --- a/meson/flex/meson.build +++ b/meson/flex/meson.build @@ -1,10 +1,8 @@ -# Find flex -# Outputs: flex - flex = find_program('flex', required: true) -summary('flex', flex.found(), bool_yn: true, section: 'Programs') -# summary('Flex', flex.full_path(), section: 'System') # TODO Meson 0.55 -# summary('Flex Version', flex.version(), section: 'System') # TODO Meson 0.62 + +summary('Flex', flex.found(), bool_yn: true, section: 'Programs') +summary('Flex Path', flex.full_path(), section: 'Programs') +summary('Flex Version', flex.version(), section: 'Programs') flex_generator = generator( flex, diff --git a/meson/ragel/meson.build b/meson/ragel/meson.build index 1ce6d8a4f2..d77aa37e21 100644 --- a/meson/ragel/meson.build +++ b/meson/ragel/meson.build @@ -1,10 +1,8 @@ -# Find Ragel and create generator -# Outputs: ragel - ragel = find_program('ragel', required: false) + summary('Ragel', ragel.found(), bool_yn: ragel.found(), section: 'Programs') -# summary('Ragel', ragel.full_path(), section: 'System') # TODO Meson 0.55 -# summary('Ragel Version', ragel.version(), section: 'System') # TODO Meson 0.62 +summary('Ragel Path', ragel.full_path(), section: 'Programs') +summary('Ragel Version', ragel.version(), section: 'Programs') ragel_generator = generator( ragel, -- 2.47.2