diff --git a/devel/lace/Makefile b/devel/lace/Makefile index 7851b1b56fac..772b085c5419 100644 --- a/devel/lace/Makefile +++ b/devel/lace/Makefile @@ -1,37 +1,37 @@ PORTNAME= lace DISTVERSIONPREFIX= v -DISTVERSION= 2.2.1 +DISTVERSION= 2.2.2 CATEGORIES= devel PKGNAMESUFFIX= -work-stealing MAINTAINER= yuri@FreeBSD.org COMMENT= Implementation of work-stealing in C WWW= https://github.com/trolando/lace LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= compilation fails: error: static assertion failed due to requirement '(sizeof(struct _lace_task) % 64) == 0': lace_task size should be a multiple of LACE_CACHE_LINE_SIZE BROKEN_i386= compilation fails: error: static assertion failed due to requirement '(sizeof(struct _lace_task) % 64) == 0': lace_task size should be a multiple of LACE_CACHE_LINE_SIZE USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= trolando CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= LACE_BUILD_TESTS \ LACE_NATIVE_OPT CMAKE_TESTING_ON= LACE_BUILD_TESTS CFLAGS+= -fPIC PORTSCOUT= limit:^.*[0-9]+\.[0-9]+\.[0-9]+$$ # prevent tags like mucocos_2014_ri pre-configure: # see discussion in https://github.com/trolando/lace/issues/16 @${REINPLACE_CMD} -e 's,memory_order_[[:alnum:]_]*,memory_order_seq_cst,g' \ ${WRKSRC}/src/*.[ch] ${WRKSRC}/src/lace.sh -# tests as of 2.2.1: 100% tests passed, 0 tests failed out of 3 +# tests as of 2.2.2: 100% tests passed, 0 tests failed out of 3 .include diff --git a/devel/lace/distinfo b/devel/lace/distinfo index eeb59ff90620..348ca108a884 100644 --- a/devel/lace/distinfo +++ b/devel/lace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1772864520 -SHA256 (trolando-lace-v2.2.1_GH0.tar.gz) = 1c36475c422f98fe7d4efcd6113c4a897f83cd187dbccd888803ab1bd64175d1 -SIZE (trolando-lace-v2.2.1_GH0.tar.gz) = 191191 +TIMESTAMP = 1774371892 +SHA256 (trolando-lace-v2.2.2_GH0.tar.gz) = 73a4dcad8eb3145fae843b8eb766f7f84992292955272ea351c9ba53c128eb4c +SIZE (trolando-lace-v2.2.2_GH0.tar.gz) = 206306 diff --git a/devel/lace/files/patch-CMakeLists.txt b/devel/lace/files/patch-CMakeLists.txt index b3d5e17315f8..680572b933a0 100644 --- a/devel/lace/files/patch-CMakeLists.txt +++ b/devel/lace/files/patch-CMakeLists.txt @@ -1,19 +1,42 @@ ---- CMakeLists.txt.orig 2026-03-06 23:32:42 UTC +--- CMakeLists.txt.orig 2026-03-24 09:36:43 UTC +++ CMakeLists.txt -@@ -91,7 +91,7 @@ foreach(_target lace lace32 lace128) +@@ -95,7 +95,7 @@ foreach(_target lace lace32 lace128) set(_src ${CMAKE_CURRENT_SOURCE_DIR}/src/lace128.c ${CMAKE_CURRENT_SOURCE_DIR}/src/lace128.h) endif() - add_library(${_target} STATIC ${_src}) + add_library(${_target} ${_src}) add_library(lace::${_target} ALIAS ${_target}) target_compile_features(${_target} PUBLIC c_std_11) -@@ -109,7 +109,6 @@ foreach(_target lace lace32 lace128) +@@ -115,7 +115,7 @@ foreach(_target lace lace32 lace128) + if(CMAKE_C_COMPILER_ID MATCHES "GNU") target_compile_options(${_target} PRIVATE -pipe - $<$:-O0 -Wall -Wextra -Wpedantic> +- -Wall -Wextra -Wpedantic -Werror ++ -Wall -Wextra -Wpedantic + -Wshadow # avoid potential shadowing bugs + -Wnull-dereference # warn when we could null dereference + -Wformat=2 # improve format string checking for logging +@@ -124,12 +124,11 @@ foreach(_target lace lace32 lace128) + -Wconversion # catch implicit narrowing conversions + -Wsign-conversion # catch implicit changes to signed/unsigned + $<$:-O0> +- $<$:-march=native> + ) + elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") + target_compile_options(${_target} PRIVATE + -pipe +- -Wall -Wextra -Wpedantic -Werror ++ -Wall -Wextra -Wpedantic + -Wshadow # avoid potential shadowing bugs + -Wnull-dereference # warn when we could null dereference + -Wformat=2 # improve format string checking for logging +@@ -139,7 +138,6 @@ foreach(_target lace lace32 lace128) + -Wsign-conversion # catch implicit changes to signed/unsigned + -Watomic-implicit-seq-cst # ensure all atomic load/store are explicit + $<$:-O0> - $<$:-march=native> ) elseif(MSVC) target_compile_options(${_target} PUBLIC diff --git a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c b/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c index 08ba81f978b7..9821718c475a 100644 --- a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c +++ b/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/cilksort/cilksort-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/cilksort/cilksort-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/cilksort/cilksort-lace.c @@ -434,7 +434,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c b/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c index ca5cfff947bf..88fb131a9c74 100644 --- a/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c +++ b/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/dfs/dfs-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/dfs/dfs-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/dfs/dfs-lace.c @@ -45,7 +45,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_fib_fib-lace.c b/devel/lace/files/patch-benchmarks_fib_fib-lace.c index 644eb1883494..10b41d78e100 100644 --- a/devel/lace/files/patch-benchmarks_fib_fib-lace.c +++ b/devel/lace/files/patch-benchmarks_fib_fib-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/fib/fib-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/fib/fib-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/fib/fib-lace.c @@ -28,7 +28,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp b/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp index c62db2d4d9c0..6e9808eafbb2 100644 --- a/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp +++ b/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp @@ -1,11 +1,11 @@ ---- benchmarks/fib/fib-lace.cpp.orig 2026-03-06 23:32:42 UTC +--- benchmarks/fib/fib-lace.cpp.orig 2026-03-24 09:36:43 UTC +++ benchmarks/fib/fib-lace.cpp @@ -29,7 +29,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c b/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c index 481206dd4dc1..9d0c3f1da039 100644 --- a/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c +++ b/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/knapsack/knapsack-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/knapsack/knapsack-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/knapsack/knapsack-lace.c @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c b/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c index 4ed8b1c8f792..6bf470516523 100644 --- a/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c +++ b/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/matmul/matmul-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/matmul/matmul-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/matmul/matmul-lace.c @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c b/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c index 685b14b44a27..8f4b3ee267e7 100644 --- a/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c +++ b/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c @@ -1,11 +1,11 @@ ---- benchmarks/matmul/matmul-seq.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/matmul/matmul-seq.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/matmul/matmul-seq.c @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) int main(int argc, char *argv[]) { - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'h': diff --git a/devel/lace/files/patch-benchmarks_pi_pi-lace.c b/devel/lace/files/patch-benchmarks_pi_pi-lace.c index 20fa39d79832..3fabdd461992 100644 --- a/devel/lace/files/patch-benchmarks_pi_pi-lace.c +++ b/devel/lace/files/patch-benchmarks_pi_pi-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/pi/pi-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/pi/pi-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/pi/pi-lace.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) int workers = 0; int dqsize = 1000000; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c b/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c index 5a19246352b9..26b9a1194f64 100644 --- a/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c +++ b/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/strassen/strassen-lace.c.orig 2026-03-06 23:32:42 UTC +--- benchmarks/strassen/strassen-lace.c.orig 2026-03-24 09:36:43 UTC +++ benchmarks/strassen/strassen-lace.c @@ -706,7 +706,7 @@ int main(int argc, char *argv[]) int verify = 0; int n = 4096; - int c; + signed int c; while ((c=getopt(argc, argv, "w:q:h:c")) != -1) { switch (c) { case 'w':