diff --git a/internal/rosa/libxslt.go b/internal/rosa/libxslt.go index 40f65ff..827dc64 100644 --- a/internal/rosa/libxslt.go +++ b/internal/rosa/libxslt.go @@ -23,6 +23,7 @@ func (t Toolchain) newLibxslt() (pkg.Artifact, string) { SkipCheck: true, }, XZ, + Zlib, Python, PkgConfig, diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 6a9532d..48cd20a 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -187,6 +187,7 @@ ln -s ld.lld /work/system/bin/ld Append: cmakeAppend, Script: script + attr.script, }, + Zlib, Libffi, Python, Perl, diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index 9754ae9..ba97594 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -13,6 +13,7 @@ func (t Toolchain) newMeson() (pkg.Artifact, string) { checksum = "w895BXF_icncnXatT_OLCFe2PYEtg4KrKooMgUYdN-nQVvbFX3PvYWHGEpogsHtd" ) return t.New("meson-"+version, 0, []pkg.Artifact{ + t.Load(Zlib), t.Load(Python), t.Load(Setuptools), }, nil, nil, ` @@ -66,6 +67,7 @@ func (*MesonHelper) name(name, version string) string { // extra returns hardcoded meson runtime dependencies. func (*MesonHelper) extra(int) []PArtifact { return []PArtifact{ + Zlib, Python, Meson, Ninja, diff --git a/internal/rosa/python.go b/internal/rosa/python.go index 937a508..631fe13 100644 --- a/internal/rosa/python.go +++ b/internal/rosa/python.go @@ -87,6 +87,7 @@ func newViaPip( } return t.New(name+"-"+version, 0, slices.Concat([]pkg.Artifact{ + t.Load(Zlib), t.Load(Python), }, extraRes), nil, nil, ` pip3 install \ @@ -112,6 +113,7 @@ func (t Toolchain) newSetuptools() (pkg.Artifact, string) { checksum = "K9f8Yi7Gg95zjmQsE1LLw9UBb8NglI6EY6pQpdD6DM0Pmc_Td5w2qs1SMngTI6Jp" ) return t.New("setuptools-"+version, 0, []pkg.Artifact{ + t.Load(Zlib), t.Load(Python), }, nil, nil, ` pip3 install \ diff --git a/internal/rosa/ssl.go b/internal/rosa/ssl.go index 21d6c50..bcae918 100644 --- a/internal/rosa/ssl.go +++ b/internal/rosa/ssl.go @@ -93,6 +93,7 @@ func init() { func (t Toolchain) newNSSCACert() (pkg.Artifact, string) { return t.New("nss-cacert", 0, []pkg.Artifact{ + t.Load(Zlib), t.Load(Bash), t.Load(Python), diff --git a/internal/rosa/stage0.go b/internal/rosa/stage0.go index b579d39..652c9b6 100644 --- a/internal/rosa/stage0.go +++ b/internal/rosa/stage0.go @@ -15,6 +15,7 @@ func (t Toolchain) newStage0() (pkg.Artifact, string) { runtimes, clang, + t.Load(Zlib), t.Load(Bzip2), t.Load(Patch),