rthooks: revise the findlibs run-time hook

WIP

Author: rokm

_pyinstaller_hooks_contrib/rthooks/pyi_rth_findlibs.py

@@ -15,10 +15,12 @@
 # the build system. This happens because we (try not to) modify `DYLD_LIBRARY_PATH`, and the original `findlibs.find()`
 # implementation gives precedence to environment variables and several fixed/hard-coded locations, and uses
 # `ctypes.util.find_library` as the final fallback...
+#
+# NOTE: the above issues have been largely resolved by contemporary versions of findlibs (i.e., >= 0.1.0), which also
+# seem to have added support for package-bundled libraries.
 def _pyi_rthook():
     import sys
     import os
-    import ctypes.util
 
     # findlibs v0.1.0 broke compatibility with python < 3.10; due to incompatible typing annotation, attempting to
     # import the package raises `TypeError: unsupported operand type(s) for |: 'type' and 'NoneType'`. Gracefully
@@ -30,26 +32,41 @@ def _pyi_rthook():
         return
 
     _orig_find = getattr(findlibs, 'find', None)
+    if _orig_find is None:
+        return
 
     def _pyi_find(lib_name, *args, **kwargs):
-        extension = findlibs.EXTENSIONS.get(sys.platform, ".so")
+        # Try to resolve using the original implementation. With contemporary versions of findlibs, this will most
+        # likely do the right thing (i.e., find the package-bundled copy). With older versions (i.e., < 0.1.0), it
+        # might end up resolving a system copy instead...
+        orig_lib = _orig_find(lib_name, *args, **kwargs)
+        print(f"findlibs-rthook: orig_lib={orig_lib}", file=sys.stderr)
+        return orig_lib  # TODO
 
-        # First check sys._MEIPASS
+        """
+        if lib is not None:
+            # Check that the
+            return
+
+        # Check in top-level application directory
+        extension = findlibs.EXTENSIONS.get(sys.platform, ".so")
         fullname = os.path.join(sys._MEIPASS, "lib{}{}".format(lib_name, extension))
         if os.path.isfile(fullname):
             return fullname
 
         # Fall back to `ctypes.util.find_library` (to give it precedence over hard-coded paths from original
-        # implementation).
-        lib = ctypes.util.find_library(lib_name)
-        if lib is not None:
-            return lib
+        # implementation). Applicable only to findlibs < 0.1.0; in co
+        if needs_override:
+            lib = ctypes.util.find_library(lib_name)
+            if lib is not None:
+                return lib
 
         # Finally, fall back to original implementation
         if _orig_find is not None:
             return _orig_find(lib_name, *args, **kwargs)
 
         return None
+    """
 
     findlibs.find = _pyi_find