mirror of
https://github.com/openbsd/ports.git
synced 2026-06-18 07:24:23 +02:00
Fix up packaging on architectures without lldb
eg powerpc64 riscv64 or sparc64 Conflicts markers tweaked to provide an automatic upgrade path for existing llvm-22 and lldb-22 packages. Reported by gkoehler@, tested by and ok gkoehler@ tb@. "go head" robert@
This commit is contained in:
@@ -4,6 +4,9 @@ LLVM_PKGSPEC = >=22,<23
|
||||
|
||||
REVISION-main = 0
|
||||
|
||||
REVISION-main = 0
|
||||
REVISION-lldb = 0
|
||||
|
||||
SHARED_LIBS += LLVM 0.0 \
|
||||
LTO 0.0 \
|
||||
Remarks 0.0 \
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
@option no-default-conflict
|
||||
@option is-branch
|
||||
@conflict lldb-${LLVM_PKGSPEC}
|
||||
@conflict llvm->=22.1.0,<22.1.7p0
|
||||
bin/lldb-${LLVM_MAJOR}
|
||||
bin/lldb-argdumper-${LLVM_MAJOR}
|
||||
bin/lldb-dap-${LLVM_MAJOR}
|
||||
bin/lldb-mcp-${LLVM_MAJOR}
|
||||
bin/lldb-server-${LLVM_MAJOR}
|
||||
bin/lldb-tblgen-${LLVM_MAJOR}
|
||||
bin/yaml2macho-core-${LLVM_MAJOR}
|
||||
@bin ${LLVM_BASE}/bin/lldb
|
||||
@bin ${LLVM_BASE}/bin/lldb-argdumper
|
||||
@bin ${LLVM_BASE}/bin/lldb-dap
|
||||
@bin ${LLVM_BASE}/bin/lldb-mcp
|
||||
@bin ${LLVM_BASE}/bin/lldb-server
|
||||
@bin ${LLVM_BASE}/bin/lldb-tblgen
|
||||
@bin ${LLVM_BASE}/bin/yaml2macho-core
|
||||
${LLVM_BASE}/include/lldb/
|
||||
${LLVM_BASE}/include/lldb/API/
|
||||
${LLVM_BASE}/include/lldb/API/LLDB.h
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@option no-default-conflict
|
||||
@option is-branch
|
||||
@conflict llvm-${LLVM_PKGSPEC}
|
||||
@conflict lldb->=22.1.0,<22.1.7p0
|
||||
bin/amdgpu-arch-${LLVM_MAJOR}
|
||||
bin/analyze-build-${LLVM_MAJOR}
|
||||
bin/bugpoint-${LLVM_MAJOR}
|
||||
@@ -119,7 +120,6 @@ bin/scan-build-py-${LLVM_MAJOR}
|
||||
bin/scan-view-${LLVM_MAJOR}
|
||||
bin/verify-uselistorder-${LLVM_MAJOR}
|
||||
bin/wasm-ld-${LLVM_MAJOR}
|
||||
bin/yaml2macho-core-${LLVM_MAJOR}
|
||||
${LLVM_BASE}/
|
||||
${LLVM_BASE}/bin/
|
||||
${LLVM_BASE}/bin/amdgpu-arch
|
||||
@@ -243,7 +243,6 @@ ${LLVM_BASE}/bin/scan-build-py
|
||||
${LLVM_BASE}/bin/scan-view
|
||||
@bin ${LLVM_BASE}/bin/verify-uselistorder
|
||||
${LLVM_BASE}/bin/wasm-ld
|
||||
@bin ${LLVM_BASE}/bin/yaml2macho-core
|
||||
${LLVM_BASE}/include/
|
||||
${LLVM_BASE}/include/clang/
|
||||
${LLVM_BASE}/include/clang-c/
|
||||
|
||||
Reference in New Issue
Block a user