From 4e534466d6fb7a15ba86bc1845100d4fb222699a Mon Sep 17 00:00:00 2001 From: xq114 <1140735506@qq.com> Date: Mon, 30 Oct 2023 21:25:51 +0800 Subject: fix apt alias on specified dependency versions --- xmake/modules/package/manager/apt/find_package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/apt/find_package.lua b/xmake/modules/package/manager/apt/find_package.lua index 0e833e2ee..d199ca5b8 100644 --- a/xmake/modules/package/manager/apt/find_package.lua +++ b/xmake/modules/package/manager/apt/find_package.lua @@ -98,7 +98,7 @@ function _find_package(dpkg, name, opt) for _, line in ipairs(statusinfo:split("\n", {plain = true})) do -- parse depends, e.g. Depends: libboost1.74-dev if line:startswith("Depends:") then - local depends = line:sub(9):split("%s+") + local depends = line:sub(9):gsub("%(.-%)", ""):split("%s+") if #depends == 1 then return _find_package(dpkg, depends[1], opt) end -- cgit v1.3.1 From 75013b053a8c6e9dac0cf95886b401350f1a0d1d Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 30 Oct 2023 09:25:59 -0500 Subject: Update find_package.lua --- xmake/modules/package/manager/apt/find_package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/apt/find_package.lua b/xmake/modules/package/manager/apt/find_package.lua index d199ca5b8..614b1028f 100644 --- a/xmake/modules/package/manager/apt/find_package.lua +++ b/xmake/modules/package/manager/apt/find_package.lua @@ -96,7 +96,7 @@ function _find_package(dpkg, name, opt) local statusinfo = try {function () return os.iorunv(dpkg.program, {"--status", name}) end} if statusinfo then for _, line in ipairs(statusinfo:split("\n", {plain = true})) do - -- parse depends, e.g. Depends: libboost1.74-dev + -- parse depends, e.g. Depends: libboost1.74-dev, libomp-14-dev (>= 14~) if line:startswith("Depends:") then local depends = line:sub(9):gsub("%(.-%)", ""):split("%s+") if #depends == 1 then -- cgit v1.3.1