diff options
Diffstat (limited to 'xmake/modules/package/manager/pacman/find_package.lua')
| -rw-r--r-- | xmake/modules/package/manager/pacman/find_package.lua | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/xmake/modules/package/manager/pacman/find_package.lua b/xmake/modules/package/manager/pacman/find_package.lua index 2a8244ff3..d939192ec 100644 --- a/xmake/modules/package/manager/pacman/find_package.lua +++ b/xmake/modules/package/manager/pacman/find_package.lua @@ -24,6 +24,7 @@ import("core.project.target") import("lib.detect.find_tool") import("private.core.base.is_cross") import("package.manager.pkgconfig.find_package", {alias = "find_package_from_pkgconfig"}) +import("get_package_name") -- find package from list of file inside pacman package function _find_package_from_list(list, name, pacman, opt) @@ -168,20 +169,8 @@ function main(name, opt) return end - -- for msys2/mingw? mingw-w64-[i686|x86_64]-xxx - if is_subhost("msys") and opt.plat == "mingw" then - -- try to get the package prefix from the environment first - -- https://www.msys2.org/docs/package-naming/ - local prefix = "mingw-w64-" - local arch = (opt.arch == "x86_64" and "x86_64-" or "i686-") - local msystem = os.getenv("MSYSTEM") - if msystem and not msystem:startswith("MINGW") then - local i, j = msystem:find("%D+") - name = prefix .. msystem:sub(i, j):lower() .. "-" .. arch .. name - else - name = prefix .. arch .. name - end - end + -- get package name + name = get_package_name(name, opt) -- get package files list local list = name and try { function() return os.iorunv(pacman.program, {"-Q", "-l", name}) end } |