Fix dirfd check, handle OpenBSD.

Author: nascheme

Tools/configure/conf_platform.py

@@ -655,7 +655,9 @@ def check_posix_shmem(v):
     v.POSIXSHMEM_CFLAGS = "-I$(srcdir)/Modules/_multiprocessing"
     v.POSIXSHMEM_LIBS = ""
     with pyconf.save_env():
-        shm_open_result = pyconf.search_libs("shm_open", ["rt"], required=False)
+        shm_open_result = pyconf.search_libs(
+            "shm_open", ["rt"], required=False
+        )
         posixshmem_libs = "-lrt" if shm_open_result == "-lrt" else ""
         have_posix_shmem = pyconf.check_func(
             "shm_open", headers=["sys/mman.h"]
@@ -743,18 +745,14 @@ def check_posix_functions(v):
 
 def check_special_functions(v):
     """Check dirfd, PY_CHECK_FUNC equivalents, flock, unsetenv, socket libs, chflags."""
-    # dirfd
+    # AC_CHECK_DECL([dirfd], [AC_DEFINE([HAVE_DIRFD])], [], [dirent.h])
     pyconf.checking("whether dirfd is declared")
-    if pyconf.compile_check(
-        preamble="#include <sys/types.h>\n#include <dirent.h>",
-        body="void *p = dirfd;",
+    if pyconf.check_decl(
+        "dirfd",
+        includes=["sys/types.h", "dirent.h"],
+        define_name="HAVE_DIRFD",
     ):
         pyconf.result("yes")
-        pyconf.define(
-            "HAVE_DIRFD",
-            1,
-            "Define if you have the 'dirfd' function or macro.",
-        )
     else:
         pyconf.result("no")
 

Tools/configure/conf_security.py

@@ -303,7 +303,9 @@ def check_ssl_cipher_suites(v):
         pyconf.define("PY_SSL_DEFAULT_CIPHERS", 2)
     else:
         pyconf.define("PY_SSL_DEFAULT_CIPHERS", 0)
-        pyconf.define_unquoted("PY_SSL_DEFAULT_CIPHER_STRING", f'"{ssl_suites}"')
+        pyconf.define_unquoted(
+            "PY_SSL_DEFAULT_CIPHER_STRING", f'"{ssl_suites}"'
+        )
 
 
 def check_builtin_hashlib_hashes(v):

Tools/configure/pyconf.py

@@ -217,7 +217,11 @@ def _load_config_site() -> None:
                 continue
             name, value = m.group(1), m.group(2)
             # Strip surrounding quotes (single or double)
-            if len(value) >= 2 and value[0] == value[-1] and value[0] in ("'", '"'):
+            if (
+                len(value) >= 2
+                and value[0] == value[-1]
+                and value[0] in ("'", '"')
+            ):
                 value = value[1:-1]
             # Command-line VAR=VALUE (already in os.environ) takes precedence
             if name not in os.environ and not vars.is_set(name):
@@ -1588,7 +1592,7 @@ def _canonicalize(triplet: str) -> str:
         host_parts = host.split("-", 2)
         host_cpu = host_parts[0]
         if build_arg:
-            cross_compiling = (host != build)
+            cross_compiling = host != build
         else:
             # autoconf sets "maybe" when --host is given without --build
             cross_compiling = "maybe" if host != build else False
@@ -2280,6 +2284,7 @@ def _compute_int(expr: str, includes: str = "") -> int | None:
 
     Returns the integer value, or None if it could not be determined.
     """
+
     def _try(boolean_expr: str) -> bool:
         src = (
             f"{includes}\n"
@@ -2602,10 +2607,7 @@ def check_sizeof(
             size = int(output_str.strip())
     if size is None:
         # Cross-compiling or run failed: compile-time binary search
-        inc = (
-            "#include <stddef.h>\n"
-            "#include <stdint.h>\n" + extra_includes
-        )
+        inc = "#include <stddef.h>\n#include <stdint.h>\n" + extra_includes
         size = _compute_int(f"(long int)(sizeof({type_}))", inc)
     if size is None:
         size = default if default is not None else 0
@@ -2658,10 +2660,7 @@ def check_alignof(type_: str) -> int:
         # Cross-compiling or run failed: compile-time binary search using
         # offsetof(struct{char c; TYPE x;}, x), matching autoconf.
         inc = "#include <stddef.h>\n"
-        expr = (
-            f"(long int)(offsetof("
-            f"struct {{ char c; {type_} x; }}, x))"
-        )
+        expr = f"(long int)(offsetof(struct {{ char c; {type_} x; }}, x))"
         alignment = _compute_int(expr, inc)
     if alignment is None:
         alignment = 0
@@ -3044,10 +3043,12 @@ def check_decl(
     extra_includes: list[str] | None = None,
     on_found: Any = None,
     on_notfound: Any = None,
+    define_name: str | None = None,
 ) -> bool:
     """AC_CHECK_DECL — check if declaration/macro *decl* is available.
 
     *includes* / *extra_includes*: headers to include in the test.
+    *define_name*: if given, define this macro to 1 when found (0 when not).
     Calls *on_found()* or *on_notfound()* callbacks. Returns bool.
     """
     if not _RE_DECL_NAME.match(decl):
@@ -3057,14 +3058,25 @@ def check_decl(
         )
     all_includes = list(includes or []) + list(extra_includes or [])
     inc_lines = "".join(f"#include <{h}>\n" for h in all_includes)
-    src = f"{inc_lines}\nint main(void) {{\n  (void){decl};\n  return 0;\n}}\n"
-    found = _compile_test(src)
-    # AC_CHECK_DECL always writes HAVE_DECL_<name> as 0 or 1
-    define(
-        "HAVE_DECL_" + decl.upper(),
-        1 if found else 0,
-        f"Define to 1 if you have the declaration of `{decl}'.",
+    # Use #ifndef guard so macros (e.g. NetBSD's dirfd) are detected too.
+    # If decl is a macro, the #ifndef body is skipped and compilation
+    # succeeds.  If it's a real declaration, (void)decl compiles.
+    src = (
+        f"{inc_lines}\n"
+        f"int main(void) {{\n"
+        f"#ifndef {decl}\n"
+        f"  (void){decl};\n"
+        f"#endif\n"
+        f"  return 0;\n"
+        f"}}\n"
     )
+    found = _compile_test(src)
+    if define_name:
+        define(
+            define_name,
+            1 if found else 0,
+            f"Define to 1 if you have the declaration of `{decl}'.",
+        )
     if found and callable(on_found):
         on_found()
     elif not found and callable(on_notfound):
@@ -3084,11 +3096,11 @@ def check_decls(
     names = [decls] if isinstance(decls, str) else decls
     all_includes = list(includes or []) + list(extra_includes or [])
     for d in names:
-        found = check_decl(d, includes=all_includes)
-        define(
-            "HAVE_DECL_" + d.upper(),
-            1 if found else 0,
-            f"Define to 1 if you have the declaration of `{d}'.",
+        # AC_CHECK_DECLS defines HAVE_DECL_<NAME> as 1 or 0 (always defined)
+        check_decl(
+            d,
+            includes=all_includes,
+            define_name="HAVE_DECL_" + d.upper(),
         )
 
 

Tools/configure/transpiler/pysh_to_awk.py

@@ -2402,6 +2402,7 @@ def _check_decl_stmts(self, call: Call) -> list[A.Stmt]:
         includes_var_expr: A.Expr | None = None
         on_found = None
         on_notfound = None
+        define_name_lit: str | None = None
         for k, v in call.kwargs.items():
             if k in ("includes", "extra_includes"):
                 if isinstance(v, PyshList):
@@ -2415,6 +2416,8 @@ def _check_decl_stmts(self, call: Call) -> list[A.Stmt]:
                 on_found = v.name
             elif k == "on_notfound" and isinstance(v, Var):
                 on_notfound = v.name
+            elif k == "define_name" and isinstance(v, Const):
+                define_name_lit = str(v.value)
         includes: A.Expr
         if includes_parts:
             includes = A.StringLit(" ".join(includes_parts))
@@ -2423,7 +2426,9 @@ def _check_decl_stmts(self, call: Call) -> list[A.Stmt]:
         else:
             includes = A.StringLit("")
         define_args: list[A.Expr] = []
-        if isinstance(decl_arg, Const) and isinstance(decl_arg.value, str):
+        if define_name_lit is not None:
+            define_args = [A.StringLit(define_name_lit)]
+        elif isinstance(decl_arg, Const) and isinstance(decl_arg.value, str):
             define_args = [
                 A.StringLit(_precompute_decl_define(decl_arg.value))
             ]
@@ -2466,7 +2471,10 @@ def _build_check_decl_expr(self, call: Call) -> A.FuncCall:
         decl = self._expr(decl_arg)
         includes = self._extract_includes_expr(call)
         define_args: list[A.Expr] = []
-        if isinstance(decl_arg, Const) and isinstance(decl_arg.value, str):
+        define_name_kw = call.kwargs.get("define_name")
+        if define_name_kw is not None and isinstance(define_name_kw, Const):
+            define_args = [A.StringLit(str(define_name_kw.value))]
+        elif isinstance(decl_arg, Const) and isinstance(decl_arg.value, str):
             define_args = [
                 A.StringLit(_precompute_decl_define(decl_arg.value))
             ]
@@ -2766,7 +2774,9 @@ def _build_link_check_call(self, method: str, call: Call) -> A.FuncCall:
             else:
                 # Insert a literal space between cflags and libs
                 args.append(
-                    A.Concat([extra_parts[0], A.StringLit(" "), extra_parts[1]])
+                    A.Concat(
+                        [extra_parts[0], A.StringLit(" "), extra_parts[1]]
+                    )
                 )
         if compiler_kw is not None:
             # Pad extra_flags if not already present

configure-new

@@ -6424,9 +6424,8 @@ function u_check_posix_functions(    ANDROID_API_LEVEL, _i_name, blocked_len, ma
 
 function u_check_special_functions(    _pyconf_cond_sys_eventfd_h, _pyconf_cond_sys_memfd_h, _pyconf_cond_sys_mman_h, _pyconf_cond_sys_timerfd_h, ac_cv_have_chflags, ac_cv_have_lchflags) {
 	pyconf_checking("whether dirfd is declared")
-	if (pyconf_compile_check("", "#include <sys/types.h>\n#include <dirent.h>\nint main(void) { void *p = dirfd; return 0; }")) {
+	if (pyconf_check_decl("dirfd", "sys/types.h dirent.h", "HAVE_DIRFD")) {
 		pyconf_result("yes")
-		pyconf_define("HAVE_DIRFD", 1, 0, "Define if you have the 'dirfd' function or macro.")
 	} else {
 		pyconf_result("no")
 	}