From 84c15c48a202e3d0e5b9266417c53fb7f112c3ef Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Sat, 19 Jun 2021 22:30:24 +0800 Subject: [PATCH] fix meson (#459) --- packages/m/meson/xmake.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/m/meson/xmake.lua b/packages/m/meson/xmake.lua index 9d233e003..12a3d2ba6 100644 --- a/packages/m/meson/xmake.lua +++ b/packages/m/meson/xmake.lua @@ -6,6 +6,7 @@ package("meson") add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz", "https://github.com/mesonbuild/meson.git") + add_versions("0.58.1", "3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d") add_versions("0.58.0", "f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd") add_versions("0.56.0", "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213") add_versions("0.50.1", "f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc") @@ -13,15 +14,8 @@ package("meson") add_deps("ninja", "python 3.x", {kind = "binary"}) on_install("@macosx", "@linux", "@windows", function (package) - local version = package:dep("python"):version() - local envs = {} - if is_host("windows") then - package:addenv("PATH", "Scripts") - envs.PYTHONPATH = package:installdir("Lib", "site-packages") - else - envs.PYTHONPATH = package:installdir("lib", "python" .. version:major() .. "." .. version:minor(), "site-packages") - end - os.vrunv("python3", {"setup.py", "install", "--prefix=" .. package:installdir()}, {envs = envs}) + local envs = {PYTHONPATH = package:installdir()} + os.vrunv("python", {"-m", "pip", "install", "--target=" .. package:installdir(), "."}, {envs = envs}) package:addenv("PYTHONPATH", envs.PYTHONPATH) end)