summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2025-08-06 08:26:49 -0700
committerYuri Victorovich <yuri@FreeBSD.org>2025-08-06 08:28:01 -0700
commit597f4a1397b66330c3d843f19ee81daa35a8b503 (patch)
tree6caf8c280f280e646c8e2654ca2bd3f41cfeddb4
parentarchivers/zipper: add LICENSE, minor improvements (diff)
devel/lace: Remove hardcoded 'native'; Fix build on i386
Submitted by: fuz Differential Revision: https://reviews.freebsd.org/D51737
-rw-r--r--devel/lace/Makefile9
-rw-r--r--devel/lace/files/patch-benchmarks_CMakeLists.txt11
2 files changed, 16 insertions, 4 deletions
diff --git a/devel/lace/Makefile b/devel/lace/Makefile
index d8bd430d5353..d239f4190fb4 100644
--- a/devel/lace/Makefile
+++ b/devel/lace/Makefile
@@ -1,6 +1,7 @@
PORTNAME= lace
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMESUFFIX= -work-stealing
@@ -8,13 +9,9 @@ MAINTAINER= yuri@FreeBSD.org
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
@@ -26,6 +23,10 @@ CMAKE_TESTING_ON= LACE_BUILD_TESTS
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.0.2: 100% tests passed, 0 tests failed out of 2
.include <bsd.port.mk>
diff --git a/devel/lace/files/patch-benchmarks_CMakeLists.txt b/devel/lace/files/patch-benchmarks_CMakeLists.txt
new file mode 100644
index 000000000000..00392a29fc02
--- /dev/null
+++ b/devel/lace/files/patch-benchmarks_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- benchmarks/CMakeLists.txt.orig 2025-08-06 15:18:26 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")