From 066d49a6350407a4d8250c11592ed86b1d0a5f1c Mon Sep 17 00:00:00 2001 From: Seedking <875828815@qq.com> Date: Sun, 3 Mar 2024 22:03:18 +0800 Subject: [PATCH] Upgrade StringZilla to 3.4.1 (#3397) * Upgrade StringZilla to 3.4.1 * add installation methods for versions hiher than 2.0.4 * exclude armeabi-v7a arch under Android --- packages/s/stringzilla/xmake.lua | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/s/stringzilla/xmake.lua b/packages/s/stringzilla/xmake.lua index 31e8b9e6e..34c1234de 100644 --- a/packages/s/stringzilla/xmake.lua +++ b/packages/s/stringzilla/xmake.lua @@ -9,9 +9,24 @@ package("stringzilla") add_versions("v1.2.2", "2e17c49965841647a1c371247f53b2f576e5fb32fe4b84a080d425b12f17703c") add_versions("v2.0.3", "6b52a7b4eb8383cbcf83608eaa08e5ba588a378449439b73584713a16d8920e3") + add_versions("v2.0.4", "440d3d586f8cfe96bc7648f01f2d3c514c4e2dc22446caeb50599383d1970ed2") + add_versions("v3.0.0", "50bc3544d97c6c1d82022a78af4ab062010a1d35096330cb84d952b0cf7d54fb") + add_versions("v3.1.0", "32580513dbc054cc23941d36e19741bce1fa106c3031670065719eb4b95afde8") + add_versions("v3.1.1", "6f7905ee481fda0230a55075f9f4704284f2c18bd53d9e1c6ef78e3eaf29cea9") + add_versions("v3.1.2", "aa25438112551eab9eec9a532749e430fe26b6562adae517c56ce0fe762af2b6") + add_versions("v3.2.0", "12789c5f81d63e569e7a1221933aa371274fa3f22f8143f7bd65b5248c66a7d9") + add_versions("v3.3.0", "15924a562e3166840a5385959dcc190eb40b49cec82900fde319774963c5d85a") + add_versions("v3.3.1", "3f6bcf9ce10089628cdb9fdb55bc94026440f07961473a0eb140ae969889aeae") + add_versions("v3.4.0", "b9f15c00079844b7eb82e613bab59a89204bdb9b1bacd1ef485fa74c8ef7ec77") + add_versions("v3.4.1", "062587d0ec08b62bba888b1ec0dcb42a68a53043af7ae6b4d0185381543c1297") - on_install(function (package) - os.cp("stringzilla/stringzilla.h", package:installdir("include")) + + on_install("android|!armeabi-v7a",function (package) + if package:version():gt("2.0.4") then + os.cp("include/stringzilla/stringzilla.h", package:installdir("include")) + else + os.cp("stringzilla/stringzilla.h", package:installdir("include")) + end end) on_test(function (package)