diff options
| author | Victor Stinner <vstinner@python.org> | 2023-09-02 21:47:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 21:47:25 (GMT) |
| commit | 7269916cd7b89b5e6f20bfe83ebe1038bda56b4b (patch) | |
| tree | 9f4455e21e10ecbd39e6b3ff58d63da9f58da60e | |
| parent | c5ce34f9b4963a672ce5993d165384e96b6eefe9 (diff) | |
| download | cpython-7269916cd7b89b5e6f20bfe83ebe1038bda56b4b.zip cpython-7269916cd7b89b5e6f20bfe83ebe1038bda56b4b.tar.gz cpython-7269916cd7b89b5e6f20bfe83ebe1038bda56b4b.tar.bz2 | |
[3.12] gh-63760: Don't declare gethostname() on Solaris (#108817) (#108824)
gh-63760: Don't declare gethostname() on Solaris (#108817)
Since 2005, Solaris defines gethostname(). socketmodule.c no longer
has to define gethostname() for Solaris.
Oracle Solaris and OpenSolaris have patches to remove the
gethostname() definition in Python:
* https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch
* https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch
* https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
(cherry picked from commit 0e6d582b3b73a88e71cae04327b31a1ee203722c)
| -rw-r--r-- | Include/pyport.h | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index d7c6ae6..35eca72 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -429,11 +429,6 @@ Please be conservative with adding new ones, document them and enclose them in platform-specific #ifdefs. **************************************************************************/ -#ifdef SOLARIS -/* Unchecked */ -extern int gethostname(char *, int); -#endif - #ifdef HAVE__GETPTY #include <sys/types.h> /* we need to import mode_t */ extern char * _getpty(int *, int, mode_t, int); diff --git a/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst b/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst new file mode 100644 index 0000000..9a7249e --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst @@ -0,0 +1,3 @@ +Fix Solaris build: no longer redefine the ``gethostname()`` function. Solaris +defines the function since 2005. Patch by Victor Stinner, original patch by +Jakub Kulík. |