Merge pull request #5666 from xmake-io/librarydep

use librarydep
xmake-io · Sep 26, 2024 · f7124e1 · f7124e1
2 parents 74a69b0 + 4b3af02
commit f7124e1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
@@ -433,6 +433,20 @@ function _instance:plaindeps()
     return self._PLAINDEPS
 end
 
+-- get library dep
+function _instance:librarydep(name, opt)
+    local key = "librarydeps_map_" .. ((opt and opt.private) and "private" or "")
+    local librarydeps_map = self:_memcache():get(key)
+    if not librarydeps_map then
+        librarydeps_map = {}
+        for _, dep in ipairs(self:librarydeps()) do
+            librarydeps_map[dep:name()] = dep
+        end
+        self:_memcache():set(key, librarydeps_map)
+    end
+    return librarydeps_map[name]
+end
+
 -- get library deps with correct link order
 function _instance:librarydeps(opt)
     if opt and opt.private then

diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
@@ -176,7 +176,7 @@ end
 function _get_cflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then
@@ -208,7 +208,7 @@ end
 function _get_ldflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then

diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
@@ -119,7 +119,7 @@ end
 function _get_cflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then
@@ -151,7 +151,7 @@ end
 function _get_ldflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then

diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
@@ -396,7 +396,7 @@ end
 function _get_cflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then
@@ -428,7 +428,7 @@ end
 function _get_ldflags_from_packagedeps(package, opt)
     local values
     for _, depname in ipairs(opt.packagedeps) do
-        local dep = type(depname) ~= "string" and depname or package:dep(depname)
+        local dep = type(depname) ~= "string" and depname or package:librarydep(depname)
         if dep then
             local fetchinfo = dep:fetch()
             if fetchinfo then