diff options
| author | Andres Freund <andres@anarazel.de> | 2022-09-28 14:21:43 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-09-28 18:48:19 -0700 |
| commit | a1b3bca1c8e32c31ba1a8d1125b2eb97f750a7f0 (patch) | |
| tree | 9d01574330bc3839f69eaa2a769b9a9a30e8e7f2 /meson.build | |
| parent | caeeabd11066a360c8a9986581da320dd5aa09b9 (diff) | |
| download | postgresql-a1b3bca1c8e32c31ba1a8d1125b2eb97f750a7f0.tar.gz | |
meson: Implement getopt logic from autoconf
Not replacing getopt/getopt_long definitely causes issues on mingw. It's not
as clear whether the solaris & openbsd aspect is still needed, but if not, we
should remove it from both autoconf and meson.
Discussion: http://postgr.es/m/20220928022724.erzuk5v4ai4b53do@awork3.anarazel.de
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meson.build b/meson.build index cd410319f3..0cd09ba430 100644 --- a/meson.build +++ b/meson.build @@ -2265,6 +2265,15 @@ posix4_dep = cc.find_library('posix4', required: false) getopt_dep = cc.find_library('getopt', required: false) gnugetopt_dep = cc.find_library('gnugetopt', required: false) +# Check if we want to replace getopt/getopt_long even if provided by the system +# - Mingw has adopted a GNU-centric interpretation of optind/optreset, +# so always use our version on Windows +# - On OpenBSD and Solaris, getopt() doesn't do what we want for long options +# (i.e., allow '-' as a flag character), so use our version on those platforms +# - We want to use system's getopt_long() only if the system provides struct +# option +always_replace_getopt = host_system in ['windows', 'openbsd', 'solaris'] +always_replace_getopt_long = host_system == 'windows' or not cdata.has('HAVE_STRUCT_OPTION') # Required on BSDs execinfo_dep = cc.find_library('execinfo', required: false) @@ -2295,8 +2304,8 @@ func_checks = [ ['explicit_bzero'], ['fdatasync', {'dependencies': [rt_dep, posix4_dep], 'define': false}], # Solaris ['getifaddrs'], - ['getopt', {'dependencies': [getopt_dep, gnugetopt_dep]}], - ['getopt_long', {'dependencies': [getopt_dep, gnugetopt_dep]}], + ['getopt', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt}], + ['getopt_long', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt_long}], ['getpeereid'], ['getpeerucred'], ['inet_aton'], |