Limit f2py symbol renaming. Ignore deleted module

Author: Maxwell175

Lib/__np__/darwin.py

@@ -78,7 +78,7 @@ def rename_init_symbol_in_file(target_lib):
                 for sym in obj_symbols:
                     if sym[0].startswith("PyInit_") or sym[0].startswith("_PyInit_") or \
                             "pyx_CommonTypesMetaclass" in sym[0] or \
-                            "_f2py_" in sym[0] or \
+                            "f2pyinittypes" in sym[0] or \
                             ("pybind11" in sym[0] and '@' not in sym[0] and '?' not in sym[0]):
                         symbols_to_rename.add(sym[0])
 

Lib/__np__/linux.py

@@ -128,7 +128,7 @@ def rename_init_symbol_in_file(target_lib):
                 for sym_name, full_line in obj_symbols:
                     if (sym_name.startswith("PyInit_") or sym_name.startswith("_PyInit_") or
                             "pyx_CommonTypesMetaclass" in sym_name or
-                            "_f2py_" in sym_name or
+                            "f2pyinittypes" in sym_name or
                             ("pybind11" in sym_name and '@' not in sym_name and '?' not in sym_name)) and \
                             not (' U ' in full_line or full_line.strip().startswith('U ')):
                         symbols_to_rename_map[sym_name] = f"{sym_name}__np__{file_hash}"

Lib/__np__/windows.py

@@ -232,7 +232,7 @@ def rename_init_symbol_in_file(target_lib):
                     # Check if it's a PyInit symbol and if it's defined (not 'U')
                     if (sym_name.startswith("PyInit_") or sym_name.startswith("_PyInit_") or
                             "pyx_CommonTypesMetaclass" in sym_name or
-                            "_f2py_" in sym_name or
+                            "f2pyinittypes" in sym_name or
                         ("pybind11" in sym_name and '@' not in sym_name and '?' not in sym_name)) and \
                             not (' u ' in line.lower() or line.lower().startswith('u ')):
                         symbols_to_rename_map[sym_name] = f"{sym_name}__np__{file_hash}"

Lib/rebuildpython.py

@@ -175,6 +175,9 @@ def run_rebuild():
             if normalized_file in checkedLibs:
                 continue
 
+            if not is_lib_valid(normalized_file):
+                continue
+
             filename_base = os.path.basename(file)
 
             python_lib = sysconfig.get_config_var("LIBRARY")
@@ -538,6 +541,7 @@ def run_rebuild():
         link_libs = sysconfig_libs + link_libs
         libpython_lib = [x for x in link_libs if os.path.basename(x).startswith('libpython') and x.endswith(".a")][0]
         link_libs = [libpython_lib] + [x for x in link_libs if x != libpython_lib]
+        link_libs = [x for x in link_libs if is_lib_valid(x)]
         library_dirs = sysconfig_lib_dirs + library_dirs
 
         compiler.compile(
@@ -596,6 +600,7 @@ def run_rebuild():
         link_libs = sysconfig_libs + link_libs
         libpython_lib = [x for x in link_libs if os.path.basename(x).startswith('libpython') and x.endswith(".a")][0]
         link_libs = [libpython_lib] + [x for x in link_libs if x != libpython_lib]
+        link_libs = [x for x in link_libs if is_lib_valid(x)]
         library_dirs = [x for x in sysconfig_lib_dirs + library_dirs if 'Nuitka-Python-Deps' not in x]
 
         os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.9"