diff --git a/packages/l/libjpeg/xmake.lua b/packages/l/libjpeg/xmake.lua index a328c5fc3..6bfd7f22a 100644 --- a/packages/l/libjpeg/xmake.lua +++ b/packages/l/libjpeg/xmake.lua @@ -19,10 +19,9 @@ package("libjpeg") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir()) - os.vrun("make") + import("package.builder.autoconf").build(package) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end) diff --git a/packages/l/libmill/xmake.lua b/packages/l/libmill/xmake.lua index 872997ba1..d9b8c5460 100644 --- a/packages/l/libmill/xmake.lua +++ b/packages/l/libmill/xmake.lua @@ -9,11 +9,10 @@ package("libmill") add_versions("1.17", "ada513275d8d5a2ce98cdbc47ad491bfb10f5e9a5429656e539a5889f863042d") on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir()) - os.vrun("make") + import("package.builder.autoconf").build(package) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end) diff --git a/packages/l/libxml2/xmake.lua b/packages/l/libxml2/xmake.lua new file mode 100644 index 000000000..a67f2365a --- /dev/null +++ b/packages/l/libxml2/xmake.lua @@ -0,0 +1,23 @@ +package("libxml2") + + set_homepage("http://xmlsoft.org/") + set_description("The XML C parser and toolkit of Gnome.") + + set_urls("https://github.com/GNOME/libxml2/archive/$(version).zip") + + add_versions("v2.9.8", "c87793e45e66a7aa19200f861873f75195065de786a21c1b469bdb7bfc1230fb") + add_versions("v2.9.7", "31dd4c0e10fa625b47e27fd6a5295d246c883f214da947b9a4a9e13733905ed9") + + on_build("windows", function (package) + end) + + on_install("windows", function (package) + end) + + on_build("macosx", "linux", function (package) + import("package.builder.autoconf").build(package) + end) + + on_install("macosx", "linux", function (package) + import("package.builder.autoconf").install(package) + end) diff --git a/packages/o/openssl/xmake.lua b/packages/o/openssl/xmake.lua index 6eeb8d002..67713501b 100644 --- a/packages/o/openssl/xmake.lua +++ b/packages/o/openssl/xmake.lua @@ -11,10 +11,9 @@ package("openssl") add_versions("github:1.1.1", "7da8c193d3828a0cb4d866dc75622b2aac392971c3d656f7817fb84355290343") on_build("linux", "macosx", function (package) - os.vrun("./config --prefix=%s %s", package:installdir(), is_mode("debug") and "--debug" or "") - os.vrun("make") + import("package.builder.autoconf").build(package, {package:debug() and "--debug" or ""}) end) on_install("linux", "macosx", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end) diff --git a/packages/p/pcre/xmake.lua b/packages/p/pcre/xmake.lua index d7bc3b8ce..ebafd77ef 100644 --- a/packages/p/pcre/xmake.lua +++ b/packages/p/pcre/xmake.lua @@ -22,10 +22,9 @@ package("pcre") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir()) - os.vrun("make") + import("package.builder.autoconf").build(package) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end) diff --git a/packages/p/pcre2/xmake.lua b/packages/p/pcre2/xmake.lua index 465e0327a..66cfc5985 100644 --- a/packages/p/pcre2/xmake.lua +++ b/packages/p/pcre2/xmake.lua @@ -23,10 +23,9 @@ package("pcre2") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir()) - os.vrun("make") + import("package.builder.autoconf").build(package) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end) diff --git a/packages/p/python/xmake.lua b/packages/p/python/xmake.lua index 040d5e7a4..c6e8b6e67 100644 --- a/packages/p/python/xmake.lua +++ b/packages/p/python/xmake.lua @@ -40,12 +40,11 @@ package("python") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir("share", package:name(), package:version_str())) - os.vrun("make -j4") + import("package.builder.autoconf").build(package, {prefix = package:installdir("share", package:name(), package:version_str())}) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin")) end) diff --git a/packages/p/python2/xmake.lua b/packages/p/python2/xmake.lua index 48090a0a7..a353249a2 100644 --- a/packages/p/python2/xmake.lua +++ b/packages/p/python2/xmake.lua @@ -30,12 +30,11 @@ package("python2") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir("share", package:name(), package:version_str())) - os.vrun("make -j4") + import("package.builder.autoconf").build(package, {prefix = package:installdir("share", package:name(), package:version_str())}) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin")) end) diff --git a/packages/p/python3/xmake.lua b/packages/p/python3/xmake.lua index cd78d9491..2f13fed60 100644 --- a/packages/p/python3/xmake.lua +++ b/packages/p/python3/xmake.lua @@ -28,12 +28,11 @@ package("python3") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s", package:installdir("share", package:name(), package:version_str())) - os.vrun("make -j4") + import("package.builder.autoconf").build(package, {prefix = package:installdir("share", package:name(), package:version_str())}) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin")) end) diff --git a/packages/s/sqlite3/xmake.lua b/packages/s/sqlite3/xmake.lua index 49c439cf5..0eff523fe 100644 --- a/packages/s/sqlite3/xmake.lua +++ b/packages/s/sqlite3/xmake.lua @@ -22,10 +22,9 @@ package("sqlite3") end) on_build("macosx", "linux", function (package) - os.vrun("./configure --prefix=%s %s", package:installdir(), package:debug() and "--enable-debug" or "") - os.vrun("make") + import("package.builder.autoconf").build(package, {package:debug() and "--enable-debug" or ""}) end) on_install("macosx", "linux", function (package) - os.vrun("make install") + import("package.builder.autoconf").install(package) end)