Refactor library name handling for ABI3 support

Author: laramiel

bazel/repo_rules/get_local_runtime_info.py

@@ -141,11 +141,16 @@ def _search_library_names(
     lib_names.append(f"{prefix}python{version}{abi_flags}{shlib_suffix}")
 
   # Also search for the abi3 libraries.
-  lib_names.append(f"{prefix}python{sys.version_info.major}{shlib_suffix}")
+  abi3_lib_names = [f"{prefix}python{sys.version_info.major}{shlib_suffix}"]
   if abi_flags:
-    lib_names.append(
+    abi3_lib_names.append(
         f"{prefix}python{sys.version_info.major}{abi_flags}{shlib_suffix}"
     )
+  for x in lib_names:
+    if x and version in x:
+      abi3_lib_names.append(x.replace(version, f"{sys.version_info.major}"))
+
+  lib_names.extend(abi3_lib_names)
   return list(dict.fromkeys(k for k in lib_names if k))
 
 
@@ -170,6 +175,19 @@ def _get_python_library_info(base_executable) -> dict[str, Any]:
       config_vars.get, version, abi_flags, shlib_suffix
   )
 
+  abi3_libraries = {
+      f"libpython{sys.version_info.major}{abi_flags}.dynlib",
+      f"libpython{sys.version_info.major}{abi_flags}.so.1.0",
+      f"libpython{sys.version_info.major}{abi_flags}.so",
+      f"python{sys.version_info.major}{abi_flags}.dll",
+      f"python{sys.version_info.major}{abi_flags}.dynlib",
+      f"libpython{sys.version_info.major}.dynlib",
+      f"libpython{sys.version_info.major}.so.1.0",
+      f"libpython{sys.version_info.major}.so",
+      f"python{sys.version_info.major}.dll",
+      f"python{sys.version_info.major}.dynlib",
+  }
+
   # Found libraries
   static_libraries: dict[str, None] = {}
   dynamic_libraries: dict[str, None] = {}
@@ -180,13 +198,7 @@ def _get_python_library_info(base_executable) -> dict[str, Any]:
   for root_dir in search_directories:
     for libname in search_libnames:
       composed_path = os.path.join(root_dir, libname)
-      is_abi3_file = os.path.basename(composed_path) in (
-          "libpython3.dynlib",
-          "libpython3.so.1.0",
-          "libpython3.so",
-          "python3.dll",
-          "python3.dynlib",
-      )
+      is_abi3_file = os.path.basename(composed_path) in abi3_libraries
 
       # Check whether the library exists and add it to the appropriate list.
       if os.path.exists(composed_path) or os.path.isdir(composed_path):