diff options
| -rw-r--r-- | internal/rosa/llvm.go | 40 | ||||
| -rw-r--r-- | internal/rosa/package/llvm/package.az | 18 |
2 files changed, 18 insertions, 40 deletions
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 9487b2d7..28415ac6 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -1,11 +1,9 @@ package rosa import ( - "io/fs" "regexp" "slices" "strings" - "unsafe" "hakurei.app/internal/pkg" ) @@ -51,24 +49,6 @@ func litArgs(verbose bool, skipChecks ...string) string { } func init() { - var llvmPatches []KV - for _, name := range [...]string{ - "increase-stack-size-unconditional", - "add-rosa-vendor", - "xfail-broken-tests", - "path-system-include", - "path-system-libraries", - } { - p, err := fs.ReadFile(nativeB, "package/llvm/"+name+".patch") - if err != nil { - panic(err) - } - llvmPatches = append(llvmPatches, KV{ - name, - unsafe.String(unsafe.SliceData(p), len(p)), - }) - } - native.MustRegister("early-compiler-rt", func(t Toolchain) (*Metadata, pkg.Artifact) { meta := Metadata{ Name: "early-compiler-rt", @@ -190,26 +170,6 @@ ln -s \ ) }) - const ( - version = "22.1.8" - checksum = "_QzoDE0W6cv0vfIWeLPDvqG_vKhz6IGWl1nqUUvhlKWiRzf5dMGqeC3tyS2XgI6j" - ) - - native.MustRegister("llvm-project", func(t Toolchain) (*Metadata, pkg.Artifact) { - meta := Metadata{ - Name: "llvm-project", - Description: "LLVM monorepo with Rosa OS patches", - Version: version, - - ID: 1830, - } - return &meta, t.NewPatchedSource("llvm-"+version, newFromGitHub( - "llvm/llvm-project", - "llvmorg-"+version, - checksum, - ), true, llvmPatches...) - }) - native.MustRegister("llvm", func(t Toolchain) (*Metadata, pkg.Artifact) { meta := Metadata{ Name: "llvm", diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az new file mode 100644 index 00000000..1f93e352 --- /dev/null +++ b/internal/rosa/package/llvm/package.az @@ -0,0 +1,18 @@ +package llvm-project { + description = "LLVM monorepo with Rosa OS patches"; + anitya = 1830; + + version# = "22.1.8"; + output = remoteGitHub { + suffix = "llvm/llvm-project"; + tag = "llvmorg-"+version; + checksum = "_QzoDE0W6cv0vfIWeLPDvqG_vKhz6IGWl1nqUUvhlKWiRzf5dMGqeC3tyS2XgI6j"; + }; + patches = [ + "increase-stack-size-unconditional.patch", + "add-rosa-vendor.patch", + "xfail-broken-tests.patch", + "path-system-include.patch", + "path-system-libraries.patch", + ]; +} |