From 30b09bd0ae8786ace3ecb89ef710972187b7d4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayd=C4=B1n=20Mercan?= Date: Fri, 3 Jan 2025 13:45:04 +0300 Subject: [PATCH] fixup! replace the build system with meson --- .gitlab-ci.yml | 14 +++++++------- bin/meson.build | 4 +--- bin/tests/system/meson.build | 4 ++++ meson.build | 21 +++++++++------------ 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dbc9cbc1c..b1c72034b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -957,7 +957,7 @@ unit:gcc:ossl3:amd64: artifacts: true # Jobs for regular GCC builds on Debian "sid" (amd64) -# Also tests configration option: --without-lmdb. +# Also tests configration option: -Dlmdb=disabled gcc:sid:amd64: variables: @@ -1687,7 +1687,7 @@ stress:short:authoritative:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: authoritative RATE: 10000 @@ -1699,7 +1699,7 @@ stress:short:recursive:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: recursive RATE: 10000 @@ -1711,7 +1711,7 @@ stress:short:rpz:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: rpz RATE: 1500 @@ -1819,7 +1819,7 @@ stress:authoritative:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: authoritative RATE: 10000 @@ -1834,7 +1834,7 @@ stress:recursive:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: recursive RATE: 10000 @@ -1849,7 +1849,7 @@ stress:rpz:freebsd13:amd64: variables: CC: clang CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS} -Dlmdb=disabled" + EXTRA_CONFIGURE: "${STRESS_CONFIGURE_FLAGS}" FLAME: /usr/local/bin/flame MODE: rpz RATE: 1500 diff --git a/bin/meson.build b/bin/meson.build index c85f64574c..92f2110ff3 100644 --- a/bin/meson.build +++ b/bin/meson.build @@ -21,6 +21,4 @@ subdir('rndc') subdir('tools') # System tests -if developer_mode - subdir('tests') -endif +subdir('tests') diff --git a/bin/tests/system/meson.build b/bin/tests/system/meson.build index 067e2c5142..f1df17c065 100644 --- a/bin/tests/system/meson.build +++ b/bin/tests/system/meson.build @@ -17,6 +17,10 @@ configure_file( }, ) +if not developer_mode + subdir_done() +endif + system_test_binaries += { # 'bigkey': files('rsabigexponent' / 'bigkey.c'), 'feature-test': files('feature-test.c'), diff --git a/meson.build b/meson.build index 079835c4fe..f0f40bf49a 100644 --- a/meson.build +++ b/meson.build @@ -656,12 +656,8 @@ proto_dep = null_dep if dnstap_opt.allowed() fstrm_dep = dependency('libfstrm', required: dnstap_opt) proto_dep = dependency('libprotobuf-c', required: dnstap_opt) - - config.set( - 'HAVE_DNSTAP', - protoc.found() and fstrm_dep.found() and proto_dep.found(), - ) endif +config.set('HAVE_DNSTAP', protoc.found() and fstrm_dep.found() and proto_dep.found()) ## JSON json_c_dep = null_dep @@ -762,21 +758,22 @@ endif idn2_dep = null_dep if idn_opt.allowed() idn2_dep = dependency('libidn2', required: idn_opt) - config.set('HAVE_LIBIDN2', idn2_dep.found()) endif +config.set('HAVE_LIBIDN2', idn2_dep.found()) ## LMDB lmdb_dep = null_dep if lmdb_opt.allowed() lmdb_dep = dependency('lmdb', required: lmdb_opt) - config.set('HAVE_LMDB', lmdb_dep.found()) endif +config.set('HAVE_LMDB', lmdb_dep.found()) +## zlib zlib_dep = null_dep if zlib_opt.allowed() zlib_dep = dependency('zlib', required: zlib_opt) - config.set('HAVE_ZLIB', zlib_dep.found()) endif +config.set('HAVE_ZLIB', zlib_dep.found()) ## Line editing (libedit, editline, readline) line_dep = null_dep @@ -814,8 +811,8 @@ endif cmocka_dep = null_dep if cmocka_opt.allowed() cmocka_dep = dependency('cmocka', version: '>=1.1.3', required: cmocka_opt) - config.set10('HAVE_CMOCKA', cmocka_dep.found()) endif +config.set10('HAVE_CMOCKA', cmocka_dep.found()) ## DTrace dtrace_header = generator( @@ -845,7 +842,7 @@ configure_file(output: 'config.h', configuration: config) add_project_arguments('-include', meson.project_build_root() / 'config.h', language: 'c') ### Build dnstap if necessary, needs configuration -if config.has('HAVE_DNSTAP') +if config.get('HAVE_DNSTAP') dnstap_schema_src = custom_target( 'dnstap-protobuf', input: ['dnstap.proto'], @@ -1352,7 +1349,7 @@ executable( ], ) -if config.has('HAVE_DNSTAP') +if config.get('HAVE_DNSTAP') executable( 'dnstap-read', dnstap_read_src, @@ -1433,7 +1430,7 @@ executable( ], ) -if config.has('HAVE_LMDB') +if config.get('HAVE_LMDB') executable( 'named-nzd2nzf', named_nzd2nzf_src,