diff options
| author | Pero Oršolić <bsd@orsolic.org> | 2024-05-08 15:42:51 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2024-05-20 14:42:36 +0000 |
| commit | 55f0537a0484d3179582c1818e5b39dbc30d57f2 (patch) | |
| tree | f7e79c036fbacf5a6798c43c9bd462740a6f2e87 | |
| parent | 8c51d3a8ca38796f9163ae0a342098f7d7c54ceb (diff) | |
| download | ports-55f0537a0484d3179582c1818e5b39dbc30d57f2.tar.gz ports-55f0537a0484d3179582c1818e5b39dbc30d57f2.zip | |
lang/zig: adjust CONFLICTS after 98d70399e765
Differential Revision: https://reviews.freebsd.org/D45024
| -rw-r--r-- | lang/zig-devel/Makefile | 2 | ||||
| -rw-r--r-- | lang/zig/Makefile | 2 | ||||
| -rw-r--r-- | lang/zig010/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lang/zig-devel/Makefile b/lang/zig-devel/Makefile index 92de92e59651..35cbed8c7dd4 100644 --- a/lang/zig-devel/Makefile +++ b/lang/zig-devel/Makefile @@ -27,7 +27,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -CONFLICTS_INSTALL= zig-devel zig0* +CONFLICTS_INSTALL= zig zig0* _LLVM_VER= 17 OPTIONS_DEFINE= DOCS STATIC diff --git a/lang/zig/Makefile b/lang/zig/Makefile index f94fdb75df83..6843b23dd88b 100644 --- a/lang/zig/Makefile +++ b/lang/zig/Makefile @@ -29,7 +29,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -CONFLICTS_INSTALL= zig010 +CONFLICTS_INSTALL= zig0* zig-devel OPTIONS_DEFINE= DOCS STATIC OPTIONS_DEFAULT= DOCS diff --git a/lang/zig010/Makefile b/lang/zig010/Makefile index c8a2b3d21c73..e4bd4984f35b 100644 --- a/lang/zig010/Makefile +++ b/lang/zig010/Makefile @@ -28,7 +28,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere -CONFLICTS_INSTALL= zig +CONFLICTS_INSTALL= zig zig-devel PORTSCOUT= limit:^0\.10\. OPTIONS_DEFINE= DOCS STATIC |