pythongh-78469: Declare missing sethostname for Solaris 10 (pythonGH-…

…109447) Add OS version specific macro for Solaris: Py_SUNOS_VERSION. (cherry picked from commit 3b1580a) Co-authored-by: Jakub Kulík <[email protected]>
miss-islington · Oct 9, 2023 · 2d973c1 · 2d973c1
1 parent 9e9df93
commit 2d973c1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -5534,8 +5534,9 @@ socket_sethostname(PyObject *self, PyObject *args)
     Py_buffer buf;
     int res, flag = 0;
 
-#ifdef _AIX
-/* issue #18259, not declared in any useful header file */
+#if defined(_AIX) || (defined(__sun) && defined(__SVR4) && Py_SUNOS_VERSION <= 510)
+/* issue #18259, sethostname is not declared in any useful header file on AIX
+ * the same is true for Solaris 10 */
 extern int sethostname(const char *, size_t);
 #endif
 

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -582,6 +582,14 @@ then
 	darwin*) MACHDEP="darwin";;
 	'')	MACHDEP="unknown";;
     esac
+
+    if test "$ac_sys_system" = "SunOS"; then
+	# For Solaris, there isn't an OS version specific macro defined
+	# in most compilers, so we define one here.
+	SUNOS_VERSION=`echo $ac_sys_release | sed -e 's!\.\([0-9]\)$!.0\1!g' | tr -d '.'`
+	AC_DEFINE_UNQUOTED([Py_SUNOS_VERSION], [$SUNOS_VERSION],
+	                   [The version of SunOS/Solaris as reported by `uname -r' without the dot.])
+    fi
 fi
 AC_MSG_RESULT("$MACHDEP")
 

diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -1595,6 +1595,9 @@
 /* Define if you want to enable internal statistics gathering. */
 #undef Py_STATS
 
+/* The version of SunOS/Solaris as reported by `uname -r' without the dot. */
+#undef Py_SUNOS_VERSION
+
 /* Define if you want to enable tracing references for debugging purpose */
 #undef Py_TRACE_REFS