Page MenuHomeFreeBSD

D51737.id159753.diff
No OneTemporary

D51737.id159753.diff

diff --git a/devel/lace/Makefile b/devel/lace/Makefile
--- a/devel/lace/Makefile
+++ b/devel/lace/Makefile
@@ -1,7 +1,6 @@
PORTNAME= lace
DISTVERSIONPREFIX= v
-DISTVERSION= 1.4.2
-PORTREVISION= 1
+DISTVERSION= 1.5.1
CATEGORIES= devel
PKGNAMESUFFIX= -work-stealing
@@ -9,13 +8,9 @@
COMMENT= Implementation of work-stealing in C
WWW= https://github.com/trolando/lace
-BROKEN_i386= compilation fails: static assertion failed due to requirement '(sizeof(struct _Task) % 64) == 0': Task size should be a multiple of LINE_SIZE
-
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_i386= compilation fails: static assertion failed due to requirement '(sizeof(struct _Task) % 64) == 0': Task size should be a multiple of LINE_SIZE
-
USES= cmake:testing
USE_GITHUB= yes
@@ -29,4 +24,8 @@
# tests as of 1.4.2: 100% tests passed, 0 tests failed out of 2
+pre-configure:
+ ${REINPLACE_CMD} -e 's,memory_order_[[:alnum:]_]*,memory_order_seq_cst,g' \
+ ${WRKSRC}/src/*.[ch] ${WRKSRC}/src/lace.sh
+
.include <bsd.port.mk>
diff --git a/devel/lace/distinfo b/devel/lace/distinfo
--- a/devel/lace/distinfo
+++ b/devel/lace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743134608
-SHA256 (trolando-lace-v1.4.2_GH0.tar.gz) = d9af1eb9d8ed2f46585085f78080e3a1b1f76fe1ef1f67794c1440a5e27bf07a
-SIZE (trolando-lace-v1.4.2_GH0.tar.gz) = 102784
+TIMESTAMP = 1754385016
+SHA256 (trolando-lace-v1.5.1_GH0.tar.gz) = 9aea38c98a059e0ddfb36df09683ea39cf55a66b4da16000532684c28d5fd6d8
+SIZE (trolando-lace-v1.5.1_GH0.tar.gz) = 155792
diff --git a/devel/lace/files/patch-benchmarks_CMakeLists.txt b/devel/lace/files/patch-benchmarks_CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/devel/lace/files/patch-benchmarks_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- benchmarks/CMakeLists.txt.orig 2025-08-04 22:55:40 UTC
++++ benchmarks/CMakeLists.txt
+@@ -4,7 +4,7 @@ macro(set_compilation_settings NAME)
+ target_compile_features(${NAME} PRIVATE c_std_11 cxx_std_11)
+ target_compile_options(${NAME} PRIVATE
+ $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
+- -pipe -march=native -Wall -Wextra -Wpedantic -Wno-deprecated>
++ -pipe -Wall -Wextra -Wpedantic -Wno-deprecated>
+ $<$<CXX_COMPILER_ID:MSVC>: /W4>
+ )
+ if (CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c b/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/cilksort/cilksort-lace.c.orig 2025-05-23 10:54:43 UTC
-+++ benchmarks/cilksort/cilksort-lace.c
-@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/dfs/dfs-lace.c.orig 2025-05-23 10:54:05 UTC
-+++ benchmarks/dfs/dfs-lace.c
-@@ -50,7 +50,7 @@ int main(int argc, char **argv)
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_fib_fib-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/fib/fib-lace.c.orig 2025-05-23 10:55:18 UTC
-+++ benchmarks/fib/fib-lace.c
-@@ -34,7 +34,7 @@ int main(int argc, char **argv)
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/fib/fib-lace.cpp.orig 2025-05-23 10:53:18 UTC
-+++ benchmarks/fib/fib-lace.cpp
-@@ -35,7 +35,7 @@ int main(int argc, char **argv)
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/knapsack/knapsack-lace.c.orig 2025-05-23 10:56:00 UTC
-+++ benchmarks/knapsack/knapsack-lace.c
-@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/matmul/matmul-lace.c.orig 2025-05-23 10:56:19 UTC
-+++ benchmarks/matmul/matmul-lace.c
-@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/matmul/matmul-seq.c.orig 2025-05-23 10:55:39 UTC
-+++ benchmarks/matmul/matmul-seq.c
-@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
-
- int main(int argc, char *argv[])
- {
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_pi_pi-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/pi/pi-lace.c.orig 2025-05-23 10:54:23 UTC
-+++ benchmarks/pi/pi-lace.c
-@@ -55,7 +55,7 @@ int main(int argc, char **argv)
- int workers = 0;
- int dqsize = 1000000;
-
-- char c;
-+ signed char c;
- while ((c=getopt(argc, argv, "w:q:h")) != -1) {
- switch (c) {
- case 'w':
diff --git a/devel/lace/files/patch-benchmarks_queens_queens-lace.c b/devel/lace/files/patch-benchmarks_queens_queens-lace.c
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_queens_queens-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/queens/queens-lace.c.orig 2025-05-23 10:53:37 UTC
-+++ benchmarks/queens/queens-lace.c
-@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
- int workers = 1;
- int dqsize = 100000;
-
-- char c;
-+ signed char 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
deleted file mode 100644
--- a/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- benchmarks/strassen/strassen-lace.c.orig 2025-05-23 10:55:02 UTC
-+++ benchmarks/strassen/strassen-lace.c
-@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
- int dqsize = 100000;
- int verify = 0;
-
-- char c;
-+ signed char c;
- while ((c=getopt(argc, argv, "w:q:h:c")) != -1) {
- switch (c) {
- case 'w':

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 1:42 PM (18 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28379818
Default Alt Text
D51737.id159753.diff (7 KB)

Event Timeline