mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
meson: Increase minimum version to 0.57.2
The previous minimum was to maintain support for Python 3.5, but we
now require Python 3.6 anyway (commit 45363fca63
), so that reason is
obsolete. A small raise to Meson 0.57 allows getting rid of a fair
amount of version conditionals and silences some future-deprecated
warnings.
With the version bump, the following deprecation warnings appeared and
are fixed:
WARNING: Project targets '>=0.57' but uses feature deprecated since '0.55.0': ExternalProgram.path. use ExternalProgram.full_path() instead
WARNING: Project targets '>=0.57' but uses feature deprecated since '0.56.0': meson.build_root. use meson.project_build_root() or meson.global_build_root() instead.
It turns out that meson 0.57.0 and 0.57.1 are buggy for our use, so
the minimum is actually set to 0.57.2. This is specific to this
version series; in the future we won't necessarily need to be this
precise.
Reviewed-by: Nazir Bilal Yavuz <byavuz81@gmail.com>
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/flat/42e13eb0-862a-441e-8d84-4f0fd5f6def0%40eisentraut.org
This commit is contained in:
@ -53,7 +53,7 @@ llvm_irgen_args = [
|
||||
|
||||
if ccache.found()
|
||||
llvm_irgen_command = ccache
|
||||
llvm_irgen_args = [clang.path()] + llvm_irgen_args
|
||||
llvm_irgen_args = [clang.full_path()] + llvm_irgen_args
|
||||
else
|
||||
llvm_irgen_command = clang
|
||||
endif
|
||||
|
@ -93,9 +93,9 @@ tests += {
|
||||
'sd': meson.current_source_dir(),
|
||||
'bd': meson.current_build_dir(),
|
||||
'tap': {
|
||||
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
|
||||
'TAR': tar.found() ? tar.path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.path() : '',
|
||||
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.full_path() : '',
|
||||
'TAR': tar.found() ? tar.full_path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.full_path() : '',
|
||||
},
|
||||
'tests': [
|
||||
't/010_pg_basebackup.pl',
|
||||
|
@ -91,9 +91,9 @@ tests += {
|
||||
'bd': meson.current_build_dir(),
|
||||
'tap': {
|
||||
'env': {
|
||||
'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.path() : '',
|
||||
'ZSTD': program_zstd.found() ? program_zstd.path() : '',
|
||||
'GZIP_PROGRAM': gzip.found() ? gzip.full_path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.full_path() : '',
|
||||
'ZSTD': program_zstd.found() ? program_zstd.full_path() : '',
|
||||
'with_icu': icu.found() ? 'yes' : 'no',
|
||||
},
|
||||
'tests': [
|
||||
|
@ -23,10 +23,10 @@ tests += {
|
||||
'sd': meson.current_source_dir(),
|
||||
'bd': meson.current_build_dir(),
|
||||
'tap': {
|
||||
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
|
||||
'TAR': tar.found() ? tar.path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.path() : '',
|
||||
'ZSTD': program_zstd.found() ? program_zstd.path() : ''},
|
||||
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.full_path() : '',
|
||||
'TAR': tar.found() ? tar.full_path() : '',
|
||||
'LZ4': program_lz4.found() ? program_lz4.full_path() : '',
|
||||
'ZSTD': program_zstd.found() ? program_zstd.full_path() : ''},
|
||||
'tests': [
|
||||
't/001_basic.pl',
|
||||
't/002_algorithm.pl',
|
||||
|
@ -28,7 +28,7 @@ node_support_input_i = [
|
||||
|
||||
node_support_input = []
|
||||
foreach i : node_support_input_i
|
||||
node_support_input += meson.source_root() / 'src' / 'include' / i
|
||||
node_support_input += meson.project_source_root() / 'src' / 'include' / i
|
||||
endforeach
|
||||
|
||||
node_support_output = [
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Copyright (c) 2022-2025, PostgreSQL Global Development Group
|
||||
|
||||
# See https://github.com/mesonbuild/meson/issues/10338
|
||||
pch_c_h = meson.source_root() / meson.current_source_dir() / 'c_pch.h'
|
||||
pch_postgres_h = meson.source_root() / meson.current_source_dir() / 'postgres_pch.h'
|
||||
pch_postgres_fe_h = meson.source_root() / meson.current_source_dir() / 'postgres_fe_pch.h'
|
||||
pch_c_h = meson.project_source_root() / meson.current_source_dir() / 'c_pch.h'
|
||||
pch_postgres_h = meson.project_source_root() / meson.current_source_dir() / 'postgres_pch.h'
|
||||
pch_postgres_fe_h = meson.project_source_root() / meson.current_source_dir() / 'postgres_fe_pch.h'
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
# Emulation of PGAC_CHECK_STRIP
|
||||
strip_bin = find_program(get_option('STRIP'), required: false, native: true)
|
||||
strip_cmd = strip_bin.found() ? [strip_bin.path()] : [':']
|
||||
strip_cmd = strip_bin.found() ? [strip_bin.full_path()] : [':']
|
||||
|
||||
working_strip = false
|
||||
if strip_bin.found()
|
||||
@ -49,8 +49,8 @@ pgxs_kv = {
|
||||
'PORTNAME': portname,
|
||||
'PG_SYSROOT': pg_sysroot,
|
||||
|
||||
'abs_top_builddir': meson.build_root(),
|
||||
'abs_top_srcdir': meson.source_root(),
|
||||
'abs_top_builddir': meson.project_build_root(),
|
||||
'abs_top_srcdir': meson.project_source_root(),
|
||||
|
||||
'enable_rpath': get_option('rpath') ? 'yes' : 'no',
|
||||
'enable_nls': libintl.found() ? 'yes' : 'no',
|
||||
@ -123,7 +123,7 @@ pgxs_kv = {
|
||||
|
||||
if llvm.found()
|
||||
pgxs_kv += {
|
||||
'CLANG': clang.path(),
|
||||
'CLANG': clang.full_path(),
|
||||
'CXX': ' '.join(cpp.cmd_array()),
|
||||
'LLVM_BINPATH': llvm_binpath,
|
||||
}
|
||||
@ -258,7 +258,7 @@ pgxs_deps = {
|
||||
pgxs_cdata = configuration_data(pgxs_kv)
|
||||
|
||||
foreach b, p : pgxs_bins
|
||||
pgxs_cdata.set(b, p.found() ? p.path() : '')
|
||||
pgxs_cdata.set(b, p.found() ? p.full_path() : '')
|
||||
endforeach
|
||||
|
||||
foreach pe : pgxs_empty
|
||||
|
@ -96,7 +96,7 @@ tests += {
|
||||
'plperl_transaction',
|
||||
'plperl_env',
|
||||
],
|
||||
'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
|
||||
'regress_args': ['--dlpath', meson.project_build_root() / 'src/test/regress'],
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ tests += {
|
||||
'reindex_conc',
|
||||
'vacuum',
|
||||
],
|
||||
'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
|
||||
'regress_args': ['--dlpath', meson.project_build_root() / 'src/test/regress'],
|
||||
# The injection points are cluster-wide, so disable installcheck
|
||||
'runningcheck': false,
|
||||
},
|
||||
|
@ -77,7 +77,7 @@ tests += {
|
||||
't/002_client.pl',
|
||||
],
|
||||
'env': {
|
||||
'PYTHON': python.path(),
|
||||
'PYTHON': python.full_path(),
|
||||
'with_libcurl': oauth_flow_supported ? 'yes' : 'no',
|
||||
'with_python': 'yes',
|
||||
},
|
||||
|
@ -7,7 +7,7 @@ tests += {
|
||||
'tap': {
|
||||
'env': {
|
||||
'with_ssl': ssl_library,
|
||||
'OPENSSL': openssl.found() ? openssl.path() : '',
|
||||
'OPENSSL': openssl.found() ? openssl.full_path() : '',
|
||||
},
|
||||
'tests': [
|
||||
't/001_ssltests.pl',
|
||||
|
Reference in New Issue
Block a user