diff --git a/packages/l/luajit/xmake.lua b/packages/l/luajit/xmake.lua index f12ceffa9..c74d4d68f 100644 --- a/packages/l/luajit/xmake.lua +++ b/packages/l/luajit/xmake.lua @@ -19,11 +19,11 @@ package("luajit") os.vrun("msvcbuild.bat") end) - on_build(function (package) + on_build("macosx", "linux", function (package) io.gsub("./Makefile", "export PREFIX= /usr/local", "export PREFIX=" .. package:installdir()) os.vrun("make") end) - on_install(function (package) + on_install("macosx", "linux", function (package) os.vrun("make install") end) diff --git a/packages/p/pcre/xmake.lua b/packages/p/pcre/xmake.lua index defa2ca90..882674c0f 100644 --- a/packages/p/pcre/xmake.lua +++ b/packages/p/pcre/xmake.lua @@ -9,11 +9,11 @@ package("pcre") add_versions("8.40", "99e19194fa57d37c38e897d07ecb3366b18e8c395b36c6d555706a7f1df0a5d4") add_versions("8.41", "0e914a3a5eb3387cad6ffac591c44b24bc384c4e828643643ebac991b57dfcc5") - on_build(function (package) + on_build("macosx", "linux", function (package) os.vrun("./configure --prefix=%s", package:installdir()) os.vrun("make") end) - on_install(function (package) + on_install("macosx", "linux", function (package) os.vrun("make install") end) diff --git a/packages/p/pcre2/xmake.lua b/packages/p/pcre2/xmake.lua index 5d6777b61..5098886f9 100644 --- a/packages/p/pcre2/xmake.lua +++ b/packages/p/pcre2/xmake.lua @@ -10,11 +10,11 @@ package("pcre2") add_versions("10.30", "3677ce17854fffa68fce6b66442858f48f0de1f537f18439e4bd2771f8b4c7fb") add_versions("10.31", "b4b40695a5347a770407d492c1749e35ba3970ca03fe83eb2c35d44343a5a444") - on_build(function (package) + on_build("macosx", "linux", function (package) os.vrun("./configure --prefix=%s", package:installdir()) os.vrun("make") end) - on_install(function (package) + on_install("macosx", "linux", function (package) os.vrun("make install") end) diff --git a/packages/t/tbox/xmake.lua b/packages/t/tbox/xmake.lua index 4a6a68d50..5d4fcc950 100644 --- a/packages/t/tbox/xmake.lua +++ b/packages/t/tbox/xmake.lua @@ -5,15 +5,16 @@ package("tbox") add_urls("https://github.com/tboox/tbox/archive/$(version).zip") add_urls("https://github.com/tboox/tbox.git") + add_urls("https://gitlab.com/tboox/tbox.git") add_urls("https://gitee.com/tboox/tbox.git") add_versions("v1.6.2", "5236090b80374b812c136c7fe6b8c694418cbfc9c0a820ec2ba35ff553078c7b") add_versions("v1.6.3", "bc5a957cdb1610c19f0cf94497ad114a0e01fd7d569777e9cb2133c513ef6baa") on_build(function (package) - os.vrun("xmake") + import("package.builder.xmake").build(package) end) on_install(function (package) - os.vrun("xmake install -o %s", package:installdir()) + import("package.builder.xmake").install(package) end) diff --git a/packages/z/zlib/xmake.lua b/packages/z/zlib/xmake.lua index dfb9faf8e..b70479c65 100644 --- a/packages/z/zlib/xmake.lua +++ b/packages/z/zlib/xmake.lua @@ -9,11 +9,11 @@ package("zlib") add_versions("1.2.10", "8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017") add_versions("1.2.11", "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1") - on_build(function (package) + on_build("macosx", "linux", function (package) os.vrun("./configure --prefix=%s", package:installdir()) os.vrun("make") end) - on_install(function (package) + on_install("macosx", "linux", function (package) os.vrun("make install") end)