Skip to content

criterion: add version 2.4.3 #8501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
+14 −7
Open

criterion: add version 2.4.3 #8501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07c576e
criterion: add version 2.4.3
luadebug Oct 27, 2025
4eaee01
criterion: update dependencies to use pkg-config for libgit2, openssl…
luadebug Oct 27, 2025
965a1c7
Update patch.lua
luadebug Oct 27, 2025
2bd82c2
criterion: update openssl dependency method to default
luadebug Oct 27, 2025
28363e3
remove Fedora-specific OpenSSL version adjustment in libgit2 installa…
luadebug Oct 27, 2025
76127d2
Try to pass OpenSSL3 next to Windows OS host
luadebug Oct 27, 2025
6bddd1b
refactor: update dependency management for libgit2 and related packages
luadebug Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/c/criterion/patch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,19 @@ function main(package)
[[nanopb = dependency('nanopb', required: get_option('wrap_mode') == 'nofallback', method: 'cmake',]],
[[nanopb = dependency('nanopb', method: 'pkg-config')]], {plain = true})
io.replace("meson.build", "modules: ['nanopb::protobuf-nanopb-static'])", "", {plain = true})
io.replace("meson.build",
[[libgit2 = dependency('libgit2', required: get_option('wrap_mode') == 'nofallback')]],
[[libgit2 = dependency('libgit2', method: 'pkg-config')]], {plain = true})
if not package:is_plat("windows", "mingw") then
io.replace("meson.build", [[libgit2 = dependency('libgit2', required: get_option('wrap_mode') == 'nofallback')]],
[[libgit2 = dependency('libgit2', method: 'pkg-config')
openssl = dependency('openssl', 'openssl3')
pcre2 = dependency('pcre2-8', 'libpcre2-8', method: 'pkg-config')
llhttp = dependency('llhttp', 'libllhttp', method: 'pkg-config')]], {plain = true})
io.replace("meson.build", [[ libgit2,
nanomsg,]], [[ libgit2,
openssl,
pcre2,
llhttp,
nanomsg,]], {plain = true})
end
if package:is_plat("windows", "mingw") then
io.replace("src/compat/path.c", "defined (HAVE_GETCWD)", "0", {plain = true})
io.replace("src/compat/path.c", "defined (HAVE_GETCURRENTDIRECTORY)", "1", {plain = true})
Expand Down
1 change: 1 addition & 0 deletions packages/c/criterion/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("criterion")
add_urls("https://github.com/Snaipe/Criterion/archive/refs/tags/$(version).tar.gz",
"https://github.com/Snaipe/Criterion.git")

add_versions("v2.4.3", "6d924ee5eeaaaed7762ab968f560b9ff543fc3473aa949bf53ac56a2a1a9416c")
add_versions("v2.4.2", "83e1a39c8c519fbef0d64057dc61c8100b3a5741595788c9f094bba2eeeef0df")

add_configs("i18n", {description = "Enable i18n", default = false, type = "boolean"})
Expand Down
4 changes: 0 additions & 4 deletions packages/l/libgit2/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ package("libgit2")
table.insert(configs, "-DDLLTOOL=" .. dlltool)
end
import("package.tools.cmake").install(package, configs, opt)
if package:is_plat("linux") and linuxos.name() == "fedora" then
io.replace(path.join(package:installdir("lib/pkgconfig"), "libgit2.pc"),
"Requires.private: openssl ", "Requires.private: openssl3 ", {plain = true})
end
end)

on_test(function (package)
Expand Down
Loading