diff options
Diffstat (limited to 'internal/rosa/cmake.go')
| -rw-r--r-- | internal/rosa/cmake.go | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 8d7129a7..986f84d0 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -13,19 +13,7 @@ func (t Toolchain) newCMake() pkg.Artifact { version = "4.2.1" checksum = "Y3OdbMsob6Xk2y1DCME6z4Fryb5_TkFD7knRT8dTNIRtSqbiCJyyDN9AxggN_I75" ) - return t.New("cmake-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(KernelHeaders), - }, nil, nil, ` -cd "$(mktemp -d)" -/usr/src/cmake/bootstrap \ - --prefix=/system \ - --parallel="$(nproc)" \ - -- \ - -DCMAKE_USE_OPENSSL=OFF -make "-j$(nproc)" -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("cmake"), true, t.NewPatchedSource( + return t.NewViaMake("cmake", version, t.NewPatchedSource( // expected to be writable in the copy made during bootstrap "cmake", version, pkg.NewHTTPGetTar( nil, "https://github.com/Kitware/CMake/releases/download/"+ @@ -33,7 +21,21 @@ make DESTDIR=/work install mustDecode(checksum), pkg.TarGzip, ), false, - ))) + ), &MakeAttr{ + OmitDefaults: true, + + SkipConfigure: true, + ScriptConfigured: ` +/usr/src/cmake/bootstrap \ + --prefix=/system \ + --parallel="$(nproc)" \ + -- \ + -DCMAKE_USE_OPENSSL=OFF +`, + SkipCheck: true, + }, + t.Load(KernelHeaders), + ) } func init() { artifactsF[CMake] = Toolchain.newCMake } |