mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
2b83df36f4
commit
d380dfeed7
@@ -1088,11 +1088,14 @@ else
|
||||
endif
|
||||
libgit_dependencies += networking_dependencies
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user