diff options
| author | ruki <[email protected]> | 2023-10-27 22:55:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-10-27 22:55:21 +0800 |
| commit | 677b872797053405054861dd4c60fec8153bec78 (patch) | |
| tree | 59f8c7594897386fb8039e9ea02909bef851f9cc /xmake/modules | |
| parent | ee9a61fdad8d0755b600864092de468a7d2b2364 (diff) | |
improve package links
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/package/manager/xmake/find_package.lua | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua index c3c09902b..0d5336fe4 100644 --- a/xmake/modules/package/manager/xmake/find_package.lua +++ b/xmake/modules/package/manager/xmake/find_package.lua @@ -20,7 +20,6 @@ -- imports import("core.base.global") -import("core.base.graph") import("core.project.config") import("core.project.option") import("core.project.target") @@ -43,58 +42,6 @@ function _deduplicate_values(values) end end --- sort links -function _sort_links(result) - print("sork_links") - print(result) - - local sortlinks = false - local makegroups = false - local linkorders = table.wrap(result.linkorders) - if #linkorders > 0 then - sortlinks = true - end - local linkgroups = table.wrap(result.linkgroups) - local linkgroups_set = hashset.new() - if #linkgroups > 0 then - makegroups = true - for _, linkgroup in ipairs(linkgroups) do - for _, link in ipairs(linkgroup) do - linkgroups_set:insert(link) - end - end - end - - -- get all links - --[[ - local links = {} - local linkgroups_map = {} - if sortlinks or makegroups then - table.remove_if(items, function (_, item) - local name = item.name - local removed = false - for _, value in ipairs(item.values) do - if name == "links" or name == "syslinks" then - if not linkgroups_set:has(value) then - table.insert(links, value) - end - removed = true - elseif name == "frameworks" then - table.insert(links, "framework::" .. value) - removed = true - elseif name == "linkgroups" then - --local key = extra and extra.name or tostring(value) - table.insert(links, "linkgroup::" .. key) - linkgroups_map[key] = value - removed = true - end - end - return removed - end) - links = table.reverse_unique(links) - end]] -end - -- find package from the repository (maybe only include and no links) function _find_package_from_repo(name, opt) @@ -283,11 +230,6 @@ function _find_package_from_repo(name, opt) end end - -- sort links - if result.linkorders or result.linkgroups then - _sort_links(result) - end - -- deduplicate result _deduplicate_values(result) |
