Changeset 65185 in vbox for trunk/src

Timestamp:

Jan 6, 2017 3:32:57 PM (8 years ago)

Author:

vboxsync

Message:

scm: fixed a loop, added support for Linux distributions which have the path in /usr/lib/*-linux-gnu and also look for .so.0 and .so.1 libraries (if the -dev/-devel package is not installed)

File:

• trunk/src/bldprogs/scmsubversion.cpp (modified) (2 diffs)

trunk/src/bldprogs/scmsubversion.cpp

@@ -691 +691 @@
             { "../lib/lib", ".so" },
             { "../lib/lib", "-1.so" },
+# ifdef RT_ARCH_X86
+            { "../lib/i386-linux-gnu/lib", ".so" },
+            { "../lib/i386-linux-gnu/lib", "-1.so" },
+# else
+            { "../lib/x86_64-linux-gnu/lib", ".so" },
+            { "../lib/x86_64-linux-gnu/lib", "-1.so" },
+# endif
 # endif
         };
-        for (unsigned iVar = 0; RT_ELEMENTS(s_aVariations); iVar++)
+        for (unsigned iVar = 0; iVar < RT_ELEMENTS(s_aVariations); iVar++)
         {
             /*
@@ -705 +712 @@
             for (iLib = 0; iLib < RT_ELEMENTS(s_apszLibraries) && RT_SUCCESS(rc); iLib++)
             {
-                *pszEndPath = '\0';
-                rc = RTPathAppend(szPath, sizeof(szPath), s_aVariations[iVar].pszPrefix);
-                if (RT_SUCCESS(rc))
-                    rc = RTStrCat(szPath, sizeof(szPath), s_apszLibraries[iLib]);
-                if (RT_SUCCESS(rc))
-                    rc = RTStrCat(szPath, sizeof(szPath), s_aVariations[iVar].pszSuffix);
-                if (RT_SUCCESS(rc))
+                static const char * const s_apszSuffixes[] = { "", ".0", ".1" };
+                for (unsigned iSuff = 0; iSuff < RT_ELEMENTS(s_apszSuffixes); iSuff++)
                 {
+                    *pszEndPath = '\0';
+                    rc = RTPathAppend(szPath, sizeof(szPath), s_aVariations[iVar].pszPrefix);
+                    if (RT_SUCCESS(rc))
+                        rc = RTStrCat(szPath, sizeof(szPath), s_apszLibraries[iLib]);
+                    if (RT_SUCCESS(rc))
+                        rc = RTStrCat(szPath, sizeof(szPath), s_aVariations[iVar].pszSuffix);
+                    if (RT_SUCCESS(rc))
+                        rc = RTStrCat(szPath, sizeof(szPath), s_apszSuffixes[iSuff]);
+                    if (RT_SUCCESS(rc))
+                    {
 # ifdef RT_OS_WINDOWS
-                    RTPathChangeToDosSlashes(pszEndPath, false);
+                        RTPathChangeToDosSlashes(pszEndPath, false);
 # endif
-                    rc = RTLdrLoadEx(szPath, &ahMods[iLib], RTLDRLOAD_FLAGS_NT_SEARCH_DLL_LOAD_DIR , NULL);
+                        rc = RTLdrLoadEx(szPath, &ahMods[iLib], RTLDRLOAD_FLAGS_NT_SEARCH_DLL_LOAD_DIR , NULL);
+                        if (RT_SUCCESS(rc))
+                            break;
+                    }
                 }
             }