Merge https://github.com/pypa/distutils

Author: jaraco

newsfragments/4871.bugfix.rst

@@ -0,0 +1 @@
+Restored implicit distutils.ccompiler import for g-ir-scanner.

newsfragments/4876.bugfix.rst

@@ -0,0 +1 @@
+Restore `distutils.ccompiler.compiler_class` -- by :user:`Avasam`

setuptools/_distutils/_msvccompiler.py

@@ -1,3 +1,5 @@
 from .compilers.C import msvc
 
+__all__ = ["MSVCCompiler"]
+
 MSVCCompiler = msvc.Compiler

setuptools/_distutils/ccompiler.py

@@ -1,17 +1,18 @@
 from .compilers.C import base
 from .compilers.C.base import (
-    CompileError,
-    LinkError,
+    compiler_class,
     gen_lib_options,
     gen_preprocess_options,
     get_default_compiler,
     new_compiler,
     show_compilers,
 )
+from .compilers.C.errors import CompileError, LinkError
 
 __all__ = [
     'CompileError',
     'LinkError',
+    'compiler_class',
     'gen_lib_options',
     'gen_preprocess_options',
     'get_default_compiler',

setuptools/_distutils/command/build.py

@@ -10,17 +10,12 @@
 from collections.abc import Callable
 from typing import ClassVar
 
+from ..ccompiler import show_compilers
 from ..core import Command
 from ..errors import DistutilsOptionError
 from ..util import get_platform
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build(Command):
     description = "build everything needed to install"
 

setuptools/_distutils/command/build_clib.py

@@ -19,17 +19,12 @@
 from distutils._log import log
 from typing import ClassVar
 
+from ..ccompiler import new_compiler, show_compilers
 from ..core import Command
 from ..errors import DistutilsSetupError
 from ..sysconfig import customize_compiler
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build_clib(Command):
     description = "build C/C++ libraries used by Python extensions"
 
@@ -93,9 +88,6 @@ def run(self) -> None:
         if not self.libraries:
             return
 
-        # Yech -- this is cut 'n pasted from build_ext.py!
-        from ..ccompiler import new_compiler
-
         self.compiler = new_compiler(
             compiler=self.compiler, dry_run=self.dry_run, force=self.force
         )

setuptools/_distutils/command/build_ext.py

@@ -16,6 +16,7 @@
 from typing import ClassVar
 
 from .._modified import newer_group
+from ..ccompiler import new_compiler, show_compilers
 from ..core import Command
 from ..errors import (
     CCompilerError,
@@ -34,12 +35,6 @@
 extension_name_re = re.compile(r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$')
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build_ext(Command):
     description = "build C/C++ extensions (compile/link to build directory)"
 
@@ -303,8 +298,6 @@ def finalize_options(self) -> None:  # noqa: C901
                 raise DistutilsOptionError("parallel should be an integer")
 
     def run(self) -> None:  # noqa: C901
-        from ..ccompiler import new_compiler
-
         # 'self.extensions', as supplied by setup.py, is a list of
         # Extension instances.  See the documentation for Extension (in
         # distutils.extension) for details.

setuptools/_distutils/command/check.py

@@ -141,7 +141,7 @@ def _check_rst_data(self, data):
         document.note_source(source_path, -1)
         try:
             parser.parse(data, document)
-        except AttributeError as e:
+        except (AttributeError, TypeError) as e:
             reporter.messages.append((
                 -1,
                 f'Could not finish the parsing: {e}.',

setuptools/_distutils/command/config.py

@@ -258,8 +258,6 @@ def try_run(
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.
         """
-        from ..ccompiler import CompileError, LinkError
-
         self._check_compiler()
         try:
             src, obj, exe = self._link(

setuptools/_distutils/compilers/C/unix.py

@@ -158,6 +158,20 @@ class Compiler(base.Compiler):
         dylib_lib_extension = ".dll"
         dylib_lib_format = "cyg%s%s"
 
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
+        """Remove standard library path from rpath"""
+        libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
+            libraries, library_dirs, runtime_library_dirs
+        )
+        libdir = sysconfig.get_config_var('LIBDIR')
+        if (
+            runtime_library_dirs
+            and libdir.startswith("/usr/lib")
+            and (libdir in runtime_library_dirs)
+        ):
+            runtime_library_dirs.remove(libdir)
+        return libraries, library_dirs, runtime_library_dirs
+
     def preprocess(
         self,
         source: str | os.PathLike[str],