keep only one flavor of libs in collect_libs()

it's quite generic, but usecase is mainy for dylib
conan-io · Jun 25, 2022 · b0c156f · b0c156f
1 parent b7a8198
commit b0c156f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/conan/tools/files/files.py b/conan/tools/files/files.py
@@ -500,18 +500,26 @@ def collect_libs(conanfile, folder=None):
             conanfile.output.warn("Lib folder doesn't exist, can't collect libraries: "
                                   "{0}".format(lib_folder))
             continue
+        # In case of symlinks, only keep shortest file name in the same "groups"
         files = os.listdir(lib_folder)
+        ref_libs = {}
         for f in files:
             name, ext = os.path.splitext(f)
             if ext in (".so", ".lib", ".a", ".dylib", ".bc"):
-                if ext != ".lib" and name.startswith("lib"):
-                    name = name[3:]
-                if name in result:
-                    conanfile.output.warn("Library '%s' was either already found in a previous "
-                                          "'conanfile.cpp_info.libdirs' folder or appears several "
-                                          "times with a different file extension" % name)
-                else:
-                    result.append(name)
+                real_lib = os.path.basename(os.path.realpath(f)) if os.path.islink(f) else f
+                if real_lib not in ref_libs or len(f) < len(ref_libs[real_lib]):
+                    ref_libs[real_lib] = f
+        # Collect reference libs
+        for f in ref_libs.values():
+            name, ext = os.path.splitext(f)
+            if ext != ".lib" and name.startswith("lib"):
+                name = name[3:]
+            if name in result:
+                conanfile.output.warn("Library '%s' was either already found in a previous "
+                                      "'conanfile.cpp_info.libdirs' folder or appears several "
+                                      "times with a different file extension" % name)
+            else:
+                result.append(name)
     result.sort()
     return result
 

diff --git a/conans/client/tools/files.py b/conans/client/tools/files.py
@@ -357,18 +357,26 @@ def collect_libs(conanfile, folder=None):
             conanfile.output.warn("Lib folder doesn't exist, can't collect libraries: "
                                   "{0}".format(lib_folder))
             continue
+        # In case of symlinks, only keep shortest file name in the same "groups"
         files = os.listdir(lib_folder)
+        ref_libs = {}
         for f in files:
             name, ext = os.path.splitext(f)
             if ext in VALID_LIB_EXTENSIONS:
-                if ext != ".lib" and name.startswith("lib"):
-                    name = name[3:]
-                if name in result:
-                    conanfile.output.warn("Library '%s' was either already found in a previous "
-                                          "'conanfile.cpp_info.libdirs' folder or appears several "
-                                          "times with a different file extension" % name)
-                else:
-                    result.append(name)
+                real_lib = os.path.basename(os.path.realpath(f)) if os.path.islink(f) else f
+                if real_lib not in ref_libs or len(f) < len(ref_libs[real_lib]):
+                    ref_libs[real_lib] = f
+        # Collect reference libs
+        for f in ref_libs.values():
+            name, ext = os.path.splitext(f)
+            if ext != ".lib" and name.startswith("lib"):
+                name = name[3:]
+            if name in result:
+                conanfile.output.warn("Library '%s' was either already found in a previous "
+                                      "'conanfile.cpp_info.libdirs' folder or appears several "
+                                      "times with a different file extension" % name)
+            else:
+                result.append(name)
     result.sort()
     return result