From 93971673047328dab4f81c799adcd985e45daedb Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 12 Oct 2020 23:14:33 +0800 Subject: [PATCH] improve pcre2 --- packages/p/pcre2/xmake.lua | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/p/pcre2/xmake.lua b/packages/p/pcre2/xmake.lua index d460cb1d1..14700ee36 100644 --- a/packages/p/pcre2/xmake.lua +++ b/packages/p/pcre2/xmake.lua @@ -26,24 +26,22 @@ package("pcre2") end end) - if is_plat("windows") and winos.version():gt("winxp") then - on_install("windows", function (package) - local configs = {"-DPCRE2_BUILD_TESTS=OFF", "-DPCRE2_BUILD_PCRE2GREP=OFF"} - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DPCRE2_SUPPORT_JIT=" .. (package:config("jit") and "ON" or "OFF")) - local bitwidth = package:config("bitwidth") or "8" - if bitwidth ~= "8" then - table.insert(configs, "-DPCRE2_BUILD_PCRE2_8=OFF") - table.insert(configs, "-DPCRE2_BUILD_PCRE2_" .. bitwidth .. "=ON") - end - if package:debug() then - table.insert(configs, "-DPCRE2_DEBUG=ON") - end - import("package.tools.cmake").install(package, configs) - end) - end + on_install("windows", function (package) + local configs = {"-DPCRE2_BUILD_TESTS=OFF", "-DPCRE2_BUILD_PCRE2GREP=OFF"} + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DPCRE2_SUPPORT_JIT=" .. (package:config("jit") and "ON" or "OFF")) + local bitwidth = package:config("bitwidth") or "8" + if bitwidth ~= "8" then + table.insert(configs, "-DPCRE2_BUILD_PCRE2_8=OFF") + table.insert(configs, "-DPCRE2_BUILD_PCRE2_" .. bitwidth .. "=ON") + end + if package:debug() then + table.insert(configs, "-DPCRE2_DEBUG=ON") + end + import("package.tools.cmake").install(package, configs) + end) - on_install("macosx", "linux", "mingw@linux,macosx", function (package) + on_install("macosx", "linux", "mingw", function (package) local configs = {} if package:config("shared") then table.insert(configs, "--enable-shared=yes")