diff options
| author | Eli Schwartz <eschwartz@gentoo.org> | 2025-04-25 01:25:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-25 09:35:56 -0700 |
| commit | d380dfeed74d9f4530cdab41f51bd287aebfbe4d (patch) | |
| tree | 842a224132212719ac634a38ad23974b41fa4a13 | |
| parent | meson: fix typo in function check that prevented checking for hstrerror (diff) | |
| download | git-d380dfeed74d9f4530cdab41f51bd287aebfbe4d.tar.gz git-d380dfeed74d9f4530cdab41f51bd287aebfbe4d.zip | |
meson: only check for missing networking syms on non-Windows; add compat impls
These are added in the Makefile, but not in meson. They probably won't
work well on systems without them.
CMake adds them, but only on non-Windows. Actually, it only performs
compiler checks for hstrerror, but excludes that check on Windows with
the note that it is "incompatible with the Windows build". This seems to
be misleading -- it is not incompatible, it simply doesn't exist. Still,
the compat version should not be used.
I interpret this cmake logic to mean we shouldn't even be checking for
symbol availability on Windows. In addition to making it simple to add
compat definitions, this also probably shaves off a second or two of
configure time on Windows as no compiler check needs to be performed.
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 25bac8d89f..fbe43be949 100644 --- a/meson.build +++ b/meson.build @@ -1088,11 +1088,14 @@ else endif libgit_dependencies += networking_dependencies -foreach symbol : ['inet_ntop', 'inet_pton', 'hstrerror'] - if not compiler.has_function(symbol, dependencies: networking_dependencies) - libgit_c_args += '-DNO_' + symbol.to_upper() - endif -endforeach +if host_machine.system() != 'windows' + foreach symbol : ['inet_ntop', 'inet_pton', 'hstrerror'] + if not compiler.has_function(symbol, dependencies: networking_dependencies) + libgit_c_args += '-DNO_' + symbol.to_upper() + libgit_sources += 'compat/' + symbol + '.c' + endif + endforeach +endif has_ipv6 = compiler.has_function('getaddrinfo', dependencies: networking_dependencies) if not has_ipv6 |