From b3f0360a05230dde609eb0e3fabf3a5d92792f94 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 13 Mar 2026 12:39:36 +0900 Subject: [PATCH] internal/rosa: populate runtime dependencies This also removes manually resolved indirect dependencies. Signed-off-by: Ophestra --- internal/rosa/acl.go | 4 ++++ internal/rosa/curl.go | 5 ++++ internal/rosa/elfutils.go | 8 +++++++ internal/rosa/fakeroot.go | 3 --- internal/rosa/fuse.go | 4 ---- internal/rosa/git.go | 21 ++++++++--------- internal/rosa/gnu.go | 41 ++++++++++++++++++++++++++------ internal/rosa/go.go | 18 ++------------ internal/rosa/gtk.go | 6 +++++ internal/rosa/hakurei.go | 34 +++++++++++---------------- internal/rosa/kernel.go | 6 ----- internal/rosa/kmod.go | 6 +++++ internal/rosa/libgd.go | 4 ++++ internal/rosa/libxslt.go | 5 +++- internal/rosa/llvm.go | 2 -- internal/rosa/meson.go | 17 +++++++------- internal/rosa/musl-fts.go | 3 --- internal/rosa/musl-obstack.go | 3 --- internal/rosa/nettle.go | 4 ++++ internal/rosa/nss.go | 16 +++++++------ internal/rosa/perl.go | 20 ++++++++++++---- internal/rosa/procps.go | 3 --- internal/rosa/python.go | 44 +++++++++++++++++------------------ internal/rosa/qemu.go | 10 ++++---- internal/rosa/rdfind.go | 4 ++++ internal/rosa/squashfs.go | 6 +++++ internal/rosa/tamago.go | 8 +++---- internal/rosa/unzip.go | 8 +++---- internal/rosa/wayland.go | 9 ++++--- internal/rosa/x.go | 10 ++++---- internal/rosa/xcb.go | 6 ++++- 31 files changed, 194 insertions(+), 144 deletions(-) diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go index 4f90f02..780ee0f 100644 --- a/internal/rosa/acl.go +++ b/internal/rosa/acl.go @@ -101,6 +101,10 @@ func init() { Description: "Commands for Manipulating POSIX Access Control Lists", Website: "https://savannah.nongnu.org/projects/acl/", + Dependencies: P{ + Attr, + }, + ID: 16, } } diff --git a/internal/rosa/curl.go b/internal/rosa/curl.go index 14dcb59..1622254 100644 --- a/internal/rosa/curl.go +++ b/internal/rosa/curl.go @@ -35,6 +35,11 @@ func init() { Description: "command line tool and library for transferring data with URLs", Website: "https://curl.se/", + Dependencies: P{ + Libpsl, + OpenSSL, + }, + ID: 381, } } diff --git a/internal/rosa/elfutils.go b/internal/rosa/elfutils.go index bb9a451..8279652 100644 --- a/internal/rosa/elfutils.go +++ b/internal/rosa/elfutils.go @@ -46,6 +46,14 @@ func init() { Description: "utilities and libraries to handle ELF files and DWARF data", Website: "https://sourceware.org/elfutils/", + Dependencies: P{ + Zlib, + Bzip2, + Zstd, + MuslFts, + MuslObstack, + }, + ID: 5679, } } diff --git a/internal/rosa/fakeroot.go b/internal/rosa/fakeroot.go index 4bb8f97..7cd7110 100644 --- a/internal/rosa/fakeroot.go +++ b/internal/rosa/fakeroot.go @@ -36,9 +36,6 @@ index f135ad9..85c784c 100644 // makes assumptions about /etc/passwd SkipCheck: true, }, - M4, - Perl, - Autoconf, Automake, Libtool, PkgConfig, diff --git a/internal/rosa/fuse.go b/internal/rosa/fuse.go index 62b971c..06c53e2 100644 --- a/internal/rosa/fuse.go +++ b/internal/rosa/fuse.go @@ -24,10 +24,6 @@ func (t Toolchain) newFuse() (pkg.Artifact, string) { // this project uses pytest SkipTest: true, }, - PythonIniConfig, - PythonPackaging, - PythonPluggy, - PythonPygments, PythonPyTest, KernelHeaders, diff --git a/internal/rosa/git.go b/internal/rosa/git.go index 9427169..e92cd0e 100644 --- a/internal/rosa/git.go +++ b/internal/rosa/git.go @@ -53,15 +53,12 @@ disable_test t2200-add-update "prove", }, }, - Perl, Diffutils, - M4, Autoconf, Gettext, Zlib, Curl, - OpenSSL, Libexpat, ), version } @@ -73,6 +70,12 @@ func init() { Description: "distributed version control system", Website: "https://www.git-scm.com/", + Dependencies: P{ + Zlib, + Curl, + Libexpat, + }, + ID: 5350, } } @@ -82,14 +85,10 @@ func (t Toolchain) NewViaGit( name, url, rev string, checksum pkg.Checksum, ) pkg.Artifact { - return t.New(name+"-"+rev, 0, []pkg.Artifact{ - t.Load(NSSCACert), - t.Load(OpenSSL), - t.Load(Libpsl), - t.Load(Curl), - t.Load(Libexpat), - t.Load(Git), - }, &checksum, nil, ` + return t.New(name+"-"+rev, 0, t.AppendPresets(nil, + NSSCACert, + Git, + ), &checksum, nil, ` git \ -c advice.detachedHead=false \ clone \ diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go index c0846f5..c3c4868 100644 --- a/internal/rosa/gnu.go +++ b/internal/rosa/gnu.go @@ -117,6 +117,11 @@ func init() { Description: "M4 macros to produce self-contained configure script", Website: "https://www.gnu.org/software/autoconf/", + Dependencies: P{ + M4, + Perl, + }, + ID: 141, } } @@ -143,8 +148,6 @@ test_disable '#!/bin/sh' t/distname.sh test_disable '#!/bin/sh' t/pr9.sh `, }, (*MakeHelper)(nil), - M4, - Perl, Grep, Gzip, Autoconf, @@ -159,6 +162,10 @@ func init() { Description: "a tool for automatically generating Makefile.in files", Website: "https://www.gnu.org/software/automake/", + Dependencies: P{ + Autoconf, + }, + ID: 144, } } @@ -524,6 +531,11 @@ func init() { Description: "the GNU square-wheel-reinvension of man pages", Website: "https://www.gnu.org/software/texinfo/", + Dependencies: P{ + Perl, + Gawk, + }, + ID: 4958, } } @@ -660,7 +672,6 @@ func (t Toolchain) newBC() (pkg.Artifact, string) { Writable: true, Chmod: true, }, (*MakeHelper)(nil), - Perl, Texinfo, ), version } @@ -762,6 +773,10 @@ func init() { Description: "a shell tool for executing jobs in parallel using one or more computers", Website: "https://www.gnu.org/software/parallel/", + Dependencies: P{ + Perl, + }, + ID: 5448, } } @@ -839,6 +854,10 @@ func init() { Description: "a C library for multiple-precision floating-point computations", Website: "https://www.mpfr.org/", + Dependencies: P{ + GMP, + }, + ID: 2019, } } @@ -854,7 +873,6 @@ func (t Toolchain) newMPC() (pkg.Artifact, string) { mustDecode(checksum), pkg.TarGzip, ), nil, (*MakeHelper)(nil), - GMP, MPFR, ), version } @@ -866,6 +884,10 @@ func init() { Description: "a C library for the arithmetic of complex numbers", Website: "https://www.multiprecision.org/", + Dependencies: P{ + MPFR, + }, + ID: 1667, } } @@ -1063,10 +1085,7 @@ ln -s system/lib /work/ }, Binutils, - GMP, - MPFR, MPC, - Zlib, Libucontext, KernelHeaders, @@ -1080,6 +1099,14 @@ func init() { Description: "The GNU Compiler Collection", Website: "https://www.gnu.org/software/gcc/", + Dependencies: P{ + Binutils, + + MPC, + Zlib, + Libucontext, + }, + ID: 6502, } } diff --git a/internal/rosa/go.go b/internal/rosa/go.go index a2d6f1b..a5e6a4c 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -74,22 +74,8 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) { bootstrapExtra = append(bootstrapExtra, t.newGoBootstrap()) case "arm64": - bootstrapEnv = append(bootstrapEnv, - "GOROOT_BOOTSTRAP=/system", - ) - bootstrapExtra = append(bootstrapExtra, - t.Load(Binutils), - - t.Load(GMP), - t.Load(MPFR), - t.Load(MPC), - - t.Load(Zlib), - t.Load(Libucontext), - - t.Load(gcc), - ) - + bootstrapEnv = append(bootstrapEnv, "GOROOT_BOOTSTRAP=/system") + bootstrapExtra = t.AppendPresets(bootstrapExtra, gcc) finalEnv = append(finalEnv, "CGO_ENABLED=0") default: diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go index b912d84..25ed551 100644 --- a/internal/rosa/gtk.go +++ b/internal/rosa/gtk.go @@ -56,6 +56,12 @@ func init() { Description: "the GNU library of miscellaneous stuff", Website: "https://developer.gnome.org/glib/", + Dependencies: P{ + PCRE2, + Libffi, + Zlib, + }, + ID: 10024, } } diff --git a/internal/rosa/hakurei.go b/internal/rosa/hakurei.go index b584707..e1dabc2 100644 --- a/internal/rosa/hakurei.go +++ b/internal/rosa/hakurei.go @@ -15,29 +15,23 @@ echo hostname = "" } - return t.New("hakurei"+suffix+"-"+hakureiVersion, 0, []pkg.Artifact{ - t.Load(Go), + return t.New("hakurei"+suffix+"-"+hakureiVersion, 0, t.AppendPresets(nil, + Go, + PkgConfig, - t.Load(Gzip), - t.Load(PkgConfig), + // dist tarball + Gzip, - t.Load(KernelHeaders), - t.Load(Libseccomp), - t.Load(ACL), - t.Load(Attr), - t.Load(Fuse), + // statically linked + Libseccomp, + ACL, + Fuse, + XCB, + Wayland, + WaylandProtocols, - t.Load(Xproto), - t.Load(LibXau), - t.Load(XCBProto), - t.Load(XCB), - - t.Load(Libffi), - t.Load(Libexpat), - t.Load(Libxml2), - t.Load(Wayland), - t.Load(WaylandProtocols), - }, nil, []string{ + KernelHeaders, + ), nil, []string{ "CGO_ENABLED=1", "GOCACHE=/tmp/gocache", "CC=clang -O3 -Werror", diff --git a/internal/rosa/kernel.go b/internal/rosa/kernel.go index c285fd8..fed8862 100644 --- a/internal/rosa/kernel.go +++ b/internal/rosa/kernel.go @@ -1246,13 +1246,9 @@ rm -v /work/system/lib/modules/` + kernelVersion + `/build Python, XZ, - Zlib, Gzip, - Bzip2, - Zstd, Kmod, Elfutils, - OpenSSL, UtilLinux, KernelHeaders, ), kernelVersion @@ -1315,9 +1311,7 @@ func (t Toolchain) newFirmware() (pkg.Artifact, string) { SkipCheck: true, // requires pre-commit Install: `make "-j$(nproc)" DESTDIR=/work/system dedup`, }, - Perl, Parallel, - Nettle, Rdfind, Zstd, Findutils, diff --git a/internal/rosa/kmod.go b/internal/rosa/kmod.go index 0b41621..61346ab 100644 --- a/internal/rosa/kmod.go +++ b/internal/rosa/kmod.go @@ -39,6 +39,12 @@ func init() { Description: "a set of tools to handle common tasks with Linux kernel modules", Website: "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git", + Dependencies: P{ + Zlib, + Zstd, + OpenSSL, + }, + ID: 1517, } } diff --git a/internal/rosa/libgd.go b/internal/rosa/libgd.go index c6b9204..460cafd 100644 --- a/internal/rosa/libgd.go +++ b/internal/rosa/libgd.go @@ -31,6 +31,10 @@ func init() { Description: "an open source code library for the dynamic creation of images", Website: "https://libgd.github.io/", + Dependencies: P{ + Zlib, + }, + ID: 880, } } diff --git a/internal/rosa/libxslt.go b/internal/rosa/libxslt.go index 827dc64..9f0c3d2 100644 --- a/internal/rosa/libxslt.go +++ b/internal/rosa/libxslt.go @@ -23,7 +23,6 @@ func (t Toolchain) newLibxslt() (pkg.Artifact, string) { SkipCheck: true, }, XZ, - Zlib, Python, PkgConfig, @@ -38,6 +37,10 @@ func init() { Description: "an XSLT processor based on libxml2", Website: "https://gitlab.gnome.org/GNOME/libxslt/", + Dependencies: P{ + Libxml2, + }, + ID: 13301, } } diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 0768c12..e2abdfb 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -189,8 +189,6 @@ ln -s ld.lld /work/system/bin/ld Append: cmakeAppend, Script: script + attr.script, }, - Zlib, - Libffi, Python, Perl, Diffutils, diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index ba97594..55f146e 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -38,6 +38,13 @@ func init() { Description: "an open source build system", Website: "https://mesonbuild.com/", + Dependencies: P{ + Python, + PkgConfig, + CMake, + Ninja, + }, + ID: 6472, } } @@ -66,15 +73,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, - - PkgConfig, - CMake, - } + return []PArtifact{Meson} } // wantsChmod returns false. diff --git a/internal/rosa/musl-fts.go b/internal/rosa/musl-fts.go index 5e0e016..1b12c24 100644 --- a/internal/rosa/musl-fts.go +++ b/internal/rosa/musl-fts.go @@ -19,9 +19,6 @@ func (t Toolchain) newMuslFts() (pkg.Artifact, string) { }, &MakeHelper{ Generate: "./bootstrap.sh", }, - M4, - Perl, - Autoconf, Automake, Libtool, PkgConfig, diff --git a/internal/rosa/musl-obstack.go b/internal/rosa/musl-obstack.go index 84d5045..595d4db 100644 --- a/internal/rosa/musl-obstack.go +++ b/internal/rosa/musl-obstack.go @@ -19,9 +19,6 @@ func (t Toolchain) newMuslObstack() (pkg.Artifact, string) { }, &MakeHelper{ Generate: "./bootstrap.sh", }, - M4, - Perl, - Autoconf, Automake, Libtool, PkgConfig, diff --git a/internal/rosa/nettle.go b/internal/rosa/nettle.go index 2384891..a9d7f18 100644 --- a/internal/rosa/nettle.go +++ b/internal/rosa/nettle.go @@ -26,6 +26,10 @@ func init() { Description: "a low-level cryptographic library", Website: "https://www.lysator.liu.se/~nisse/nettle/", + Dependencies: P{ + GMP, + }, + ID: 2073, } } diff --git a/internal/rosa/nss.go b/internal/rosa/nss.go index 36dbeda..5f0a233 100644 --- a/internal/rosa/nss.go +++ b/internal/rosa/nss.go @@ -75,6 +75,10 @@ func init() { Description: "Network Security Services", Website: "https://firefox-source-docs.mozilla.org/security/nss/index.html", + Dependencies: P{ + Zlib, + }, + ID: 2503, } } @@ -92,14 +96,12 @@ 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), + return t.New("nss-cacert", 0, t.AppendPresets(nil, + Bash, - t.Load(NSS), - t.Load(buildcatrust), - }, nil, nil, ` + NSS, + buildcatrust, + ), nil, nil, ` mkdir -p /work/system/etc/ssl/{certs/unbundled,certs/hashed,trust-source} buildcatrust \ --certdata_input /system/nss/certdata.txt \ diff --git a/internal/rosa/perl.go b/internal/rosa/perl.go index 3a5fae6..07c1198 100644 --- a/internal/rosa/perl.go +++ b/internal/rosa/perl.go @@ -68,14 +68,14 @@ func (t Toolchain) newViaPerlModuleBuild( name, version string, source pkg.Artifact, patches [][2]string, - extra ...pkg.Artifact, + extra ...PArtifact, ) pkg.Artifact { if name == "" || version == "" { panic("names must be non-empty") } - return t.New("perl-"+name, 0, slices.Concat(extra, []pkg.Artifact{ - t.Load(Perl), - }), nil, nil, ` + return t.New("perl-"+name, 0, t.AppendPresets(nil, + slices.Concat(P{Perl}, extra)..., + ), nil, nil, ` cd /usr/src/`+name+` perl Build.PL --prefix=/system ./Build build @@ -105,6 +105,10 @@ func init() { Name: "perl-Module::Build", Description: "build and install Perl modules", Website: "https://metacpan.org/release/Module-Build", + + Dependencies: P{ + Perl, + }, } } @@ -267,6 +271,10 @@ func init() { Name: "perl-Text::WrapI18N", Description: "line wrapping module", Website: "https://metacpan.org/release/Text-WrapI18N", + + Dependencies: P{ + PerlTextCharWidth, + }, } } @@ -313,6 +321,10 @@ func init() { Name: "perl-Unicode::GCString", Description: "String as Sequence of UAX #29 Grapheme Clusters", Website: "https://metacpan.org/release/Unicode-LineBreak", + + Dependencies: P{ + PerlMIMECharset, + }, } } diff --git a/internal/rosa/procps.go b/internal/rosa/procps.go index f078c43..bd7b759 100644 --- a/internal/rosa/procps.go +++ b/internal/rosa/procps.go @@ -18,9 +18,6 @@ func (t Toolchain) newProcps() (pkg.Artifact, string) { {"without-ncurses"}, }, }, - M4, - Perl, - Autoconf, Automake, Gettext, Libtool, diff --git a/internal/rosa/python.go b/internal/rosa/python.go index a401953..9ab88b8 100644 --- a/internal/rosa/python.go +++ b/internal/rosa/python.go @@ -53,11 +53,11 @@ func (t Toolchain) newPython() (pkg.Artifact, string) { Check: []string{"test"}, }, Zlib, + Bzip2, Libffi, + OpenSSL, PkgConfig, - OpenSSL, - Bzip2, XZ, ), version } @@ -69,6 +69,13 @@ func init() { Description: "the Python programming language interpreter", Website: "https://www.python.org/", + Dependencies: P{ + Zlib, + Bzip2, + Libffi, + OpenSSL, + }, + ID: 13254, } } @@ -81,15 +88,9 @@ func newViaPip( wname := name + "-" + version + "-" + interpreter + "-" + abi + "-" + platform + ".whl" return Metadata{ f: func(t Toolchain) (pkg.Artifact, string) { - extraRes := make([]pkg.Artifact, len(extra)) - for i, p := range extra { - extraRes[i] = t.Load(p) - } - - return t.New(name+"-"+version, 0, slices.Concat([]pkg.Artifact{ - t.Load(Zlib), - t.Load(Python), - }, extraRes), nil, nil, ` + return t.New(name+"-"+version, 0, t.AppendPresets(nil, + slices.Concat(P{Python}, extra)..., + ), nil, nil, ` pip3 install \ --no-index \ --prefix=/system \ @@ -104,6 +105,8 @@ pip3 install \ Name: "python-" + name, Description: description, Website: "https://pypi.org/project/" + name + "/", + + Dependencies: slices.Concat(P{Python}, extra), } } @@ -112,10 +115,9 @@ func (t Toolchain) newSetuptools() (pkg.Artifact, string) { version = "82.0.0" checksum = "K9f8Yi7Gg95zjmQsE1LLw9UBb8NglI6EY6pQpdD6DM0Pmc_Td5w2qs1SMngTI6Jp" ) - return t.New("setuptools-"+version, 0, []pkg.Artifact{ - t.Load(Zlib), - t.Load(Python), - }, nil, nil, ` + return t.New("setuptools-"+version, 0, t.AppendPresets(nil, + Python, + ), nil, nil, ` pip3 install \ --no-index \ --prefix=/system \ @@ -132,10 +134,14 @@ func init() { artifactsM[Setuptools] = Metadata{ f: Toolchain.newSetuptools, - Name: "setuptools", + Name: "python-setuptools", Description: "the autotools of the Python ecosystem", Website: "https://pypi.org/project/setuptools/", + Dependencies: P{ + Python, + }, + ID: 4021, } } @@ -272,8 +278,6 @@ func init() { "https://files.pythonhosted.org/packages/"+ "78/55/896b06bf93a49bec0f4ae2a6f1ed12bd05c8860744ac3a70eda041064e4d/", PythonDistlib, - PythonFilelock, - PythonPlatformdirs, PythonDiscovery, ) @@ -288,10 +292,6 @@ func init() { PythonIdentify, PythonNodeenv, PythonPyYAML, - PythonDistlib, - PythonFilelock, - PythonPlatformdirs, - PythonDiscovery, PythonVirtualenv, ) } diff --git a/internal/rosa/qemu.go b/internal/rosa/qemu.go index 96be87c..6520b59 100644 --- a/internal/rosa/qemu.go +++ b/internal/rosa/qemu.go @@ -74,21 +74,16 @@ EOF Bash, Python, Ninja, - Bzip2, PkgConfig, Diffutils, OpenSSL, - Bzip2, XZ, Flex, Bison, M4, - PCRE2, - Libffi, - Zlib, GLib, Zstd, DTC, @@ -103,6 +98,11 @@ func init() { Description: "a generic and open source machine emulator and virtualizer", Website: "https://www.qemu.org/", + Dependencies: P{ + GLib, + Zstd, + }, + ID: 13607, } } diff --git a/internal/rosa/rdfind.go b/internal/rosa/rdfind.go index a9cb6db..e379237 100644 --- a/internal/rosa/rdfind.go +++ b/internal/rosa/rdfind.go @@ -28,6 +28,10 @@ func init() { Description: "a program that finds duplicate files", Website: "https://rdfind.pauldreik.se/", + Dependencies: P{ + Nettle, + }, + ID: 231641, } } diff --git a/internal/rosa/squashfs.go b/internal/rosa/squashfs.go index 26a959c..43c9f2e 100644 --- a/internal/rosa/squashfs.go +++ b/internal/rosa/squashfs.go @@ -48,6 +48,12 @@ func init() { Description: "tools to create and extract Squashfs filesystems", Website: "https://github.com/plougher/squashfs-tools", + Dependencies: P{ + Zstd, + Gzip, + Zlib, + }, + ID: 4879, } } diff --git a/internal/rosa/tamago.go b/internal/rosa/tamago.go index 86c57a8..1c2a42d 100644 --- a/internal/rosa/tamago.go +++ b/internal/rosa/tamago.go @@ -11,10 +11,10 @@ func (t Toolchain) newTamaGo() (pkg.Artifact, string) { version = "1.26.0" checksum = "5XkfbpTpSdPJfwtTfUegfdu4LUy8nuZ7sCondiRIxTJI9eQONi8z_O_dq9yDkjw8" ) - return t.New("tamago-go"+version, 0, []pkg.Artifact{ - t.Load(Bash), - t.Load(Go), - }, nil, []string{ + return t.New("tamago-go"+version, 0, t.AppendPresets(nil, + Bash, + Go, + ), nil, []string{ "CC=cc", "GOCACHE=/tmp/gocache", }, ` diff --git a/internal/rosa/unzip.go b/internal/rosa/unzip.go index f6a65b8..b8fa3de 100644 --- a/internal/rosa/unzip.go +++ b/internal/rosa/unzip.go @@ -11,10 +11,10 @@ func (t Toolchain) newUnzip() (pkg.Artifact, string) { version = "6.0" checksum = "fcqjB1IOVRNJ16K5gTGEDt3zCJDVBc7EDSra9w3H93stqkNwH1vaPQs_QGOpQZu1" ) - return t.New("unzip-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(Coreutils), - }, nil, nil, ` + return t.New("unzip-"+version, 0, t.AppendPresets(nil, + Make, + Coreutils, + ), nil, nil, ` cd /usr/src/unzip/ unix/configure make -f unix/Makefile generic1 diff --git a/internal/rosa/wayland.go b/internal/rosa/wayland.go index 5bcf45b..b6c982d 100644 --- a/internal/rosa/wayland.go +++ b/internal/rosa/wayland.go @@ -42,6 +42,12 @@ func init() { Description: "core Wayland window system code and protocol", Website: "https://wayland.freedesktop.org/", + Dependencies: P{ + Libffi, + Libexpat, + Libxml2, + }, + ID: 10061, } } @@ -112,9 +118,6 @@ GitLab }, }, (*MesonHelper)(nil), Wayland, - Libffi, - Libexpat, - Libxml2, ), version } func init() { diff --git a/internal/rosa/x.go b/internal/rosa/x.go index 8d9a7c6..85abeea 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -40,9 +40,6 @@ func (t Toolchain) newXproto() (pkg.Artifact, string) { // ancient configure script Generate: "autoreconf -if", }, - M4, - Perl, - Autoconf, Automake, PkgConfig, @@ -75,9 +72,6 @@ func (t Toolchain) newLibXau() (pkg.Artifact, string) { // ancient configure script Generate: "autoreconf -if", }, - M4, - Perl, - Autoconf, Automake, Libtool, PkgConfig, @@ -94,6 +88,10 @@ func init() { Description: "functions for handling Xauthority files and entries", Website: "https://gitlab.freedesktop.org/xorg/lib/libxau", + Dependencies: P{ + Xproto, + }, + ID: 1765, } } diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go index d3fac5e..1f3a944 100644 --- a/internal/rosa/xcb.go +++ b/internal/rosa/xcb.go @@ -41,7 +41,6 @@ func (t Toolchain) newXCB() (pkg.Artifact, string) { PkgConfig, XCBProto, - Xproto, LibXau, ), version } @@ -53,6 +52,11 @@ func init() { Description: "The X protocol C-language Binding", Website: "https://xcb.freedesktop.org/", + Dependencies: P{ + XCBProto, + LibXau, + }, + ID: 1767, } }