diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-27 13:26:14 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-27 15:45:58 +0900 |
| commit | a5d9f76f50b86c69df11e1b178fe3e079dce79b6 (patch) | |
| tree | 522b52e92cf762aeeaf694da831bd80db80ee30d | |
| parent | b313dfefb0b072f54297369c033f406fa6d30684 (diff) | |
internal/rosa/cmake: use DESTDIR instead of --prefix
Turns out --prefix is deeply broken, and DESTDIR works even when using ninja.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | cmd/mbf/main.go | 1 | ||||
| -rw-r--r-- | internal/rosa/cmake.go | 2 | ||||
| -rw-r--r-- | internal/rosa/package/spirv.az (renamed from internal/rosa/package/spirv/package.az) | 1 | ||||
| -rw-r--r-- | internal/rosa/package/spirv/remove-early-prefix.patch | 21 |
4 files changed, 1 insertions, 24 deletions
diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index e5c17ac2..9cde0a94 100644 --- a/cmd/mbf/main.go +++ b/cmd/mbf/main.go @@ -893,7 +893,6 @@ func main() { "with-toolchain", command.BoolFlag(false), "Include the stage2 LLVM toolchain", ) - } c.Command( diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 83acad60..b058b5bf 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -98,6 +98,6 @@ cmake -G ` + generate + ` \ -DCMAKE_INSTALL_PREFIX=/system \ '/usr/src/` + name + `/` + filepath.Join(attr.Append...) + `' cmake --build . --parallel=` + jobsE + ` -cmake --install . --prefix=/work/system +DESTDIR=/work cmake --install . ` + script } diff --git a/internal/rosa/package/spirv/package.az b/internal/rosa/package/spirv.az index 464db416..f60b9239 100644 --- a/internal/rosa/package/spirv/package.az +++ b/internal/rosa/package/spirv.az @@ -57,7 +57,6 @@ package spirv-llvm-translator { tag = "v"+version; checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy"; }; - patches = [ "remove-early-prefix.patch" ]; // litArgs emits shell syntax early = "\nexport LIT_OPTS=" + litArgs { diff --git a/internal/rosa/package/spirv/remove-early-prefix.patch b/internal/rosa/package/spirv/remove-early-prefix.patch deleted file mode 100644 index f184ebc7..00000000 --- a/internal/rosa/package/spirv/remove-early-prefix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c000a77e..f18f3fde 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -164,7 +164,7 @@ install( - ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVOpts.h - ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVExtensions.inc - DESTINATION -- ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib -+ include/LLVMSPIRVLib - ) - - configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY) -@@ -172,5 +172,5 @@ install( - FILES - ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc - DESTINATION -- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig -+ lib${LLVM_LIBDIR_SUFFIX}/pkgconfig - ) -;
\ No newline at end of file |