Skip to content

gh-91962: Fix hstrerror detection issues on Solaris #91963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 5 commits into from
Oct 30, 2024
Merged

gh-91962: Fix hstrerror detection issues on Solaris #91963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de725bc
configure.ac changes
kulikjak Apr 26, 2022
eb8cd99
autoreconf
kulikjak Apr 26, 2022
d5ccc2c
improve the detection when
kulikjak Feb 13, 2024
3cfc710
One more detection rework
kulikjak Sep 13, 2024
d1d5c68
Merge branch 'main' into Solaris-hstrerror-fix
encukou Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
One more detection rework
  • Loading branch information
@kulikjak
kulikjak committed Sep 13, 2024
commit 3cfc710848e9971c8d927012dd95fc5768875a6a
163 changes: 101 additions & 62 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5279,10 +5279,12 @@ AC_CHECK_PROGS([TRUE], [true], [/bin/true])

dnl On some systems (e.g. Solaris), hstrerror and inet_aton are in -lresolv
dnl On others, they are in the C library, so we to take no action
AC_SEARCH_LIBS([inet_aton], [resolv])
AS_VAR_IF([ac_cv_search_inet_aton], ["-lresolv"], [], [
AC_SEARCH_LIBS([hstrerror], [resolv])
])
AC_CHECK_LIB([c], [inet_aton], [$ac_cv_prog_TRUE],
AC_CHECK_LIB([resolv], [inet_aton], [SOCKET_LIBS="-lresolv"])
)
AC_CHECK_LIB([c], [hstrerror], [$ac_cv_prog_TRUE],
AC_CHECK_LIB([resolv], [hstrerror], [SOCKET_LIBS="-lresolv"])
)

# On Tru64, chflags seems to be present, but calling it will
# exit Python
Expand Down Expand Up @@ -7757,7 +7759,7 @@ PY_STDLIB_MOD([mmap],
PY_STDLIB_MOD([_socket],
[], m4_flatten([test "$ac_cv_header_sys_socket_h" = "yes"
-a "$ac_cv_header_sys_types_h" = "yes"
-a "$ac_cv_header_netinet_in_h" = "yes"]))
-a "$ac_cv_header_netinet_in_h" = "yes"]), [], [$SOCKET_LIBS])

dnl platform specific extensions
PY_STDLIB_MOD([grp], [],
Expand Down