From: Patrick Steinhardt <ps@pks.im>
To: Eli Schwartz <eschwartz@gentoo.org>
Cc: git@vger.kernel.org, Sam James <sam@gentoo.org>
Subject: Re: [PATCH 6/6] meson: only check for missing networking syms on non-Windows; add compat impls
Date: Tue, 22 Apr 2025 09:31:41 +0200 [thread overview]
Message-ID: <aAdF3eu1heCycaLJ@pks.im> (raw)
In-Reply-To: <20250421175247.240971-6-eschwartz@gentoo.org>
On Mon, Apr 21, 2025 at 01:51:50PM -0400, Eli Schwartz wrote:
> 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.
CMake only checks for `hstrerror()` though -- it doesn't check for the
other functions at all.
> 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.
I dunno. In this case I'd lean towards just using the check on Windows,
too. The less platform-specific configuration we do the easier the build
system is to reason about.
> Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
> ---
> meson.build | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 1b7e55756b..24b304fb57 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
We do have compat sources for `inet_ntop()` and `inet_pton()` indeed, so
adding those makes sense. But we don't have a replacement for
`hstrerror()`, so if that function wasn't found we would error out
because "compat/hstrerror.c" wasn't found.
Patrick
next prev parent reply other threads:[~2025-04-22 7:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-21 17:51 [PATCH 1/6] meson: simplify and parameterize various standard function checks Eli Schwartz
2025-04-21 17:51 ` [PATCH 2/6] meson: check for getpagesize before using it Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-24 23:48 ` Junio C Hamano
2025-04-25 0:06 ` Eli Schwartz
2025-04-21 17:51 ` [PATCH 3/6] meson: do a full usage-based compile check for sysinfo Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-21 17:51 ` [PATCH 4/6] meson: add a couple missing networking dependencies Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-21 17:51 ` [PATCH 5/6] meson: fix typo in function check that prevented checking for hstrerror Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-21 17:51 ` [PATCH 6/6] meson: only check for missing networking syms on non-Windows; add compat impls Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt [this message]
2025-04-22 15:27 ` Eli Schwartz
2025-04-23 11:25 ` Patrick Steinhardt
2025-04-21 20:04 ` [PATCH 1/6] meson: simplify and parameterize various standard function checks Eli Schwartz
2025-04-22 0:33 ` Junio C Hamano
2025-04-22 0:58 ` Eli Schwartz
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-22 15:36 ` Eli Schwartz
2025-04-23 11:25 ` Patrick Steinhardt
2025-04-22 7:31 ` Patrick Steinhardt
2025-04-22 15:17 ` Junio C Hamano
2025-04-25 0:13 ` [PATCH v2 0/6] meson: miscellaneous system detection fixes Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 1/6] meson: simplify and parameterize various standard function checks Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 2/6] meson: check for getpagesize before using it Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 3/6] meson: do a full usage-based compile check for sysinfo Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 4/6] meson: add a couple missing networking dependencies Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 5/6] meson: fix typo in function check that prevented checking for hstrerror Eli Schwartz
2025-04-25 0:13 ` [PATCH v2 6/6] meson: only check for missing networking syms on non-Windows; add compat impls Eli Schwartz
2025-04-25 4:39 ` [PATCH v2 0/6] meson: miscellaneous system detection fixes Patrick Steinhardt
2025-04-25 5:27 ` Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 " Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 1/6] meson: simplify and parameterize various standard function checks Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 2/6] meson: check for getpagesize before using it Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 3/6] meson: do a full usage-based compile check for sysinfo Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 4/6] meson: add a couple missing networking dependencies Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 5/6] meson: fix typo in function check that prevented checking for hstrerror Eli Schwartz
2025-04-25 5:25 ` [PATCH v3 6/6] meson: only check for missing networking syms on non-Windows; add compat impls Eli Schwartz
2025-04-25 9:53 ` [PATCH v3 0/6] meson: miscellaneous system detection fixes Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aAdF3eu1heCycaLJ@pks.im \
--to=ps@pks.im \
--cc=eschwartz@gentoo.org \
--cc=git@vger.kernel.org \
--cc=sam@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.