From 12f38f35452c0424ba38661a544af249607b6189 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Oct 2020 23:23:12 +0800 Subject: [PATCH] add m4 for autoconf --- packages/a/autoconf/xmake.lua | 2 ++ packages/m/m4/xmake.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/a/autoconf/xmake.lua b/packages/a/autoconf/xmake.lua index e52fafac0..b849d027a 100644 --- a/packages/a/autoconf/xmake.lua +++ b/packages/a/autoconf/xmake.lua @@ -12,6 +12,8 @@ package("autoconf") add_versions("2.68", "eff70a2916f2e2b3ed7fe8a2d7e63d72cf3a23684b56456b319c3ebce0705d99") end + add_deps("m4") + on_install("@macosx", "@linux", function (package) import("package.tools.autoconf").install(package) end) diff --git a/packages/m/m4/xmake.lua b/packages/m/m4/xmake.lua index 8896614f6..d116e803a 100644 --- a/packages/m/m4/xmake.lua +++ b/packages/m/m4/xmake.lua @@ -8,13 +8,13 @@ package("m4") "https://ftpmirror.gnu.org/m4/m4-$(version).tar.xz") add_versions("1.4.18", "f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07") - if is_plat("macosx") then + if is_host("macosx") then -- fix crash from usage of %n in dynamic format strings on High Sierra -- patch credit to Jeremy Huddleston Sequoia add_patches("1.4.18", path.join(os.scriptdir(), "patches", "1.4.18", "secure_snprintf.patch"), "c0a408fbffb7255fcc75e26bd8edab116fc81d216bfd18b473668b7739a4158e") end - on_install("macosx", "linux", function (package) + on_install("@macosx", "@linux", function (package) import("package.tools.autoconf").install(package, {"--disable-dependency-tracking"}) end)