upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-21 17:58:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Meson: Fix check_header() for readline and gssapi

Browse source 
Since f039c22441, the minimum version of meson supported is 0.57.2,
meaning that it is possible to use the result of declare_dependency()
when checking for headers with check_header().  There were two TODOs for
readline and gssapi to change declare_dependency() after upgrading to at
least 0.57.0, which were not addressed yet.

While on it, this fixes a comment related to str.replace().  The
function has been introduced in meson 0.58.0, not 0.56.

Author: Andreas Karlsson <andreas@proxel.se>
Reviewed-by: Tristan Partin <tristan@partin.io>
Discussion: https://postgr.es/m/00cd2e0c-85df-4cf9-a889-125d85e66980@proxel.se
This commit is contained in:
Michael Paquier 2026-04-20 12:36:14 +09:00
parent 5142f0093e
commit 63a116a96e
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
meson.build
View file

@ -758,9 +758,7 @@ if not gssapiopt.disabled()
gssapi = dependency('krb5-gssapi', required: false)
have_gssapi = gssapi.found()
if have_gssapi
gssapi_deps = [gssapi]
elif not have_gssapi
if not have_gssapi
# Hardcoded lookup for gssapi. This is necessary as gssapi on windows does
# not install neither pkg-config nor cmake dependency information.
if host_system == 'windows'
@ -784,18 +782,15 @@ if not gssapiopt.disabled()
endforeach
if have_gssapi
# Meson before 0.57.0 did not support using check_header() etc with
# declare_dependency(). Thus the tests below use the library looked up
# above. Once we require a newer meson version, we can simplify.
gssapi = declare_dependency(dependencies: gssapi_deps)
endif
endif
if not have_gssapi
elif cc.check_header('gssapi/gssapi.h', dependencies: gssapi_deps, required: false,
elif cc.check_header('gssapi/gssapi.h', dependencies: [gssapi], required: false,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_GSSAPI_H', 1)
elif cc.check_header('gssapi.h', dependencies: gssapi_deps, required: gssapiopt,
elif cc.check_header('gssapi.h', dependencies: [gssapi], required: gssapiopt,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_H', 1)
else
@ -803,10 +798,10 @@ if not gssapiopt.disabled()
endif
if not have_gssapi
elif cc.check_header('gssapi/gssapi_ext.h', dependencies: gssapi_deps, required: false,
elif cc.check_header('gssapi/gssapi_ext.h', dependencies: [gssapi], required: false,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_GSSAPI_EXT_H', 1)
elif cc.check_header('gssapi_ext.h', dependencies: gssapi_deps, required: gssapiopt,
elif cc.check_header('gssapi_ext.h', dependencies: [gssapi], required: gssapiopt,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_EXT_H', 1)
else
@ -814,7 +809,7 @@ if not gssapiopt.disabled()
endif
if not have_gssapi
elif cc.has_function('gss_store_cred_into', dependencies: gssapi_deps,
elif cc.has_function('gss_store_cred_into', dependencies: [gssapi],
args: test_c_args, include_directories: postgres_inc)
cdata.set('ENABLE_GSS', 1)
@ -1563,17 +1558,6 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
'rl_filename_quoting_function',
]
foreach var : check_vars
cdata.set('HAVE_' + var.to_upper(),
cc.has_header_symbol(readline_h, var,
args: test_c_args, include_directories: postgres_inc,
prefix: '#include <stdio.h>',
dependencies: [readline]) ? 1 : false)
endforeach
# If found via cc.find_library() ensure headers are found when using the
# dependency. On meson < 0.57 one cannot do compiler checks using the
# dependency returned by declare_dependency(), so we can't do this above.
if readline.type_name() == 'library'
readline = declare_dependency(dependencies: readline,
include_directories: postgres_inc)
@ -1585,6 +1569,14 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
readline = declare_dependency(dependencies: readline,
link_args: '-Wl,--enable-auto-import')
endif
foreach var : check_vars
cdata.set('HAVE_' + var.to_upper(),
cc.has_header_symbol(readline_h, var,
args: test_c_args, include_directories: postgres_inc,
prefix: '#include <stdio.h>',
dependencies: [readline]) ? 1 : false)
endforeach
endif
# XXX: Figure out whether to implement mingw warning equivalent
@ -3755,7 +3747,7 @@ endforeach
# find and report conflicting files
foreach build_path : potentially_conflicting_files
build_path = host_system == 'windows' ? fs.as_posix(build_path) : build_path
# str.replace is in 0.56
# str.replace is in meson 0.58.0.
src_path = meson.current_source_dir() / build_path.split(meson.current_build_dir() / '')[1]
if fs.exists(src_path) or fs.is_symlink(src_path)
conflicting_files += src_path