Sort libraries to be installed only after dependencies that are actually present

lib/installer.py

@@ -83,9 +83,6 @@ def install_lib(lib, src_dir, work_dir, inst_dir, comp_cc, comp_cxx, comp_fc, bu
         finished = False
         while build_task.poll() is None:
             if not finished:
-                # bar_width = num_objects
-                # while (bar_width > 100):
-                #    bar_width = int(bar_width/10)
                 bar_width = 50
                 for i in progressbar(range(num_objects),  "Building library: ", bar_width):
                     while len(glob.glob('**/*.o', recursive=True)) < i:

lib/sort.py

@@ -25,14 +25,24 @@ def sort_libs_by_dependencies(selected_libs):
     if len(selected_libs) < 2:
         return selected_libs
 
+    lib_names = []
+    for lib in selected_libs:
+        lib_names.append(lib['name'])
+
     deplist = []
     for lib in selected_libs:
         name = lib['name']
-        dependencies = set(lib['dependencies'].split(','))
+        # only sort after dependencies that are actually present to avoid cyclic dependencies
+        deps = []
+        for dep in lib['dependencies'].split(','):
+            if dep in lib_names:
+                deps.append(dep)
+        dependencies = set(deps)
         if dependencies == {''}:
             dependencies = {}
         deplist.append([name, dependencies])
     sorted_deplist = topological_sort(deplist)
+
     sorted = []
     for entry in sorted_deplist:
         for lib in selected_libs: