diff --git a/internal/rosa/package/acl/package.az b/internal/rosa/package/acl/package.az index d4e4a13e..6908ff88 100644 --- a/internal/rosa/package/acl/package.az +++ b/internal/rosa/package/acl/package.az @@ -39,7 +39,7 @@ package acl { exec = make { // makes assumptions about uid_map/gid_map - skipCheck = true; + check = nil; }; inputs = [ attr, kernel-headers ]; diff --git a/internal/rosa/package/awk.az b/internal/rosa/package/awk.az index 8f97fa04..2b2dc4a4 100644 --- a/internal/rosa/package/awk.az +++ b/internal/rosa/package/awk.az @@ -15,9 +15,9 @@ package awk { chmod = true; exec = make { - omitDefaults = true; - inPlace = true; - skipConfigure = true; + defaults = false; + chdir = false; + configure = nil; make = [ "YACC='yacc -d -b awkgram'" ]; preCheck = "install -vD a.out /system/bin/awk\n"; install = "install -vD a.out /work/system/bin/awk"; diff --git a/internal/rosa/package/bison.az b/internal/rosa/package/bison.az index dc68f1a8..67aed088 100644 --- a/internal/rosa/package/bison.az +++ b/internal/rosa/package/bison.az @@ -12,7 +12,7 @@ package bison { toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; check = [ "TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests { tests = [ diff --git a/internal/rosa/package/byacc.az b/internal/rosa/package/byacc.az index 67dc2ad5..4a10e5f3 100644 --- a/internal/rosa/package/byacc.az +++ b/internal/rosa/package/byacc.az @@ -19,6 +19,6 @@ package byacc { chmod = true; exec = make { - omitDefaults = true; + defaults = false; }; } diff --git a/internal/rosa/package/bzip2.az b/internal/rosa/package/bzip2.az index f1b4ed25..2b8e3362 100644 --- a/internal/rosa/package/bzip2.az +++ b/internal/rosa/package/bzip2.az @@ -15,13 +15,10 @@ package bzip2 { enterSource = true; exec = make { - skipConfigure = true; - skipCheck = true; - inPlace = true; - - make = [ - "CC=cc", - ]; + chdir = false; + configure = nil; + make = [ "CC=cc" ]; + check = nil; install = "make PREFIX=/work/system install"; }; } diff --git a/internal/rosa/package/cairo.az b/internal/rosa/package/cairo.az index 289098c8..46102c19 100644 --- a/internal/rosa/package/cairo.az +++ b/internal/rosa/package/cairo.az @@ -27,7 +27,7 @@ package cairo { // runs the entire test suite in a single meson test interactiveTest = true; // only works with specific dependency versions - skipTest = true; + test = false; }; inputs = [ diff --git a/internal/rosa/package/cmake/package.az b/internal/rosa/package/cmake/package.az index ab94f869..56ef7a22 100644 --- a/internal/rosa/package/cmake/package.az +++ b/internal/rosa/package/cmake/package.az @@ -20,7 +20,7 @@ package cmake { chmod = true; exec = make { - omitDefaults = true; + defaults = false; configureName = "/usr/src/cmake/bootstrap"; configure = { diff --git a/internal/rosa/package/db.az b/internal/rosa/package/db.az index 4bb577e4..d4f9fe4d 100644 --- a/internal/rosa/package/db.az +++ b/internal/rosa/package/db.az @@ -21,7 +21,7 @@ touch \ `; exec = make { - inPlace = true; + chdir = false; configureName = "../dist/configure"; forceAutoconf = true; configure = { diff --git a/internal/rosa/package/elfutils.az b/internal/rosa/package/elfutils.az index 371386e4..1a1519ac 100644 --- a/internal/rosa/package/elfutils.az +++ b/internal/rosa/package/elfutils.az @@ -18,12 +18,12 @@ package elfutils { ]; exec = make { - // nonstandard glibc extension - skipCheck = true; - configure = { "enable-deterministic-archives"; }; + + // nonstandard glibc extension + check = nil; }; inputs = [ diff --git a/internal/rosa/package/firmware.az b/internal/rosa/package/firmware.az index 6355c93b..4642ead9 100644 --- a/internal/rosa/package/firmware.az +++ b/internal/rosa/package/firmware.az @@ -22,17 +22,17 @@ package firmware { ]; exec = make { - omitDefaults = true; - skipConfigure = true; - inPlace = true; + defaults = false; + chdir = false; + configure = nil; make = [ "DESTDIR=/work/system", "install-zst", ]; // requires pre-commit - skipCheck = true; + check = nil; install = "make " + jobsFlagE + " " + loadFlagE + " DESTDIR=/work/system dedup"; }; diff --git a/internal/rosa/package/fuse.az b/internal/rosa/package/fuse.az index 72bc568a..292a3208 100644 --- a/internal/rosa/package/fuse.az +++ b/internal/rosa/package/fuse.az @@ -22,7 +22,7 @@ package fuse { postCompile = "python3 -m pytest test/"; // this project uses pytest - skipTest = true; + test = false; }; inputs = [ diff --git a/internal/rosa/package/gcc/package.az b/internal/rosa/package/gcc/package.az index 36924c84..44c75131 100644 --- a/internal/rosa/package/gcc/package.az +++ b/internal/rosa/package/gcc/package.az @@ -65,7 +65,7 @@ ln -s system/lib /work/ // This toolchain is hacked to pieces, it is not expected to ever work // well in its current state. That does not matter as long as the // toolchain it produces passes its own test suite. - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/git.az b/internal/rosa/package/git.az index 39c5b46f..4b2b8d44 100644 --- a/internal/rosa/package/git.az +++ b/internal/rosa/package/git.az @@ -23,7 +23,7 @@ rm -f /system/bin/httpd bin = [ "perl" ]; populateUsrBin = true; exec = make { - inPlace = true; + chdir = false; generate = "make configure"; preMake = ` diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az index d3886ffd..b3ed798c 100644 --- a/internal/rosa/package/gnu.az +++ b/internal/rosa/package/gnu.az @@ -19,7 +19,7 @@ chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; }; inputs = [ @@ -114,7 +114,7 @@ package libtool { exec = make { // _Z2a2c: symbol not found - skipEarlyStageCheck = true; + checkEarly = false; check = [ "TESTSUITEFLAGS=" + jobsFlagE, @@ -142,7 +142,7 @@ package gzip { exec = make { // dependency loop - skipCheck = true; + check = nil; }; } @@ -197,7 +197,7 @@ test_disable '#!/bin/sh' tests/cmp toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; }; } @@ -223,7 +223,7 @@ test_disable '#!/bin/sh' tests/need-filename toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; }; } @@ -334,7 +334,7 @@ package bash { toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; configure = { "without-bash-malloc"; }; @@ -371,7 +371,7 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c `; exec = make { - omitDefaults = true; + defaults = false; configure = { "enable-single-binary": "symlinks"; }; @@ -436,7 +436,7 @@ package texinfo { exec = make { // nonstandard glibc extension - skipCheck = true; + check = nil; }; inputs = [ perl ]; @@ -648,7 +648,7 @@ package mpc { enterSource = true; exec = make { - inPlace = true; + chdir = false; generate = "autoreconf -vfi"; }; diff --git a/internal/rosa/package/go/package.az b/internal/rosa/package/go/package.az index 6a1f0620..73a52da3 100644 --- a/internal/rosa/package/go/package.az +++ b/internal/rosa/package/go/package.az @@ -27,7 +27,7 @@ package go { enterSource = true; exec = generic { - inPlace = true; + chdir = false; build = ` mkdir /work/system/ "${TMPDIR}" cp -r . /work/system/go diff --git a/internal/rosa/package/hakurei/package.az b/internal/rosa/package/hakurei/package.az index 1885f7ab..8a9d164e 100644 --- a/internal/rosa/package/hakurei/package.az +++ b/internal/rosa/package/hakurei/package.az @@ -32,7 +32,7 @@ package hakurei { }; exec = generic { - inPlace = true; + chdir = false; build = ` echo 'Building test helper (hostname).' go build -o /bin/hostname /usr/src/hostname/main.go @@ -103,7 +103,7 @@ package hakurei-dist { }; exec = generic { - inPlace = true; + chdir = false; build = ` echo 'Building test helper (hostname).' go build -o /bin/hostname /usr/src/hostname/main.go @@ -146,7 +146,7 @@ package earlyinit { ]; exec = generic { - inPlace = true; + chdir = false; build = ` echo '# Building earlyinit.' go build -trimpath -v -o /work/ -ldflags="-s -w diff --git a/internal/rosa/package/hwdata.az b/internal/rosa/package/hwdata.az index 8d5232b4..b826953c 100644 --- a/internal/rosa/package/hwdata.az +++ b/internal/rosa/package/hwdata.az @@ -15,9 +15,9 @@ package hwdata { exec = make { // awk: fatal: cannot open file `hwdata.spec' for reading: No such file or directory - inPlace = true; + chdir = false; // lspci: Unknown option 'A' (see "lspci --help") - skipCheck = true; + check = nil; }; } diff --git a/internal/rosa/package/iproute2.az b/internal/rosa/package/iproute2.az index c759fec6..4f0c00c9 100644 --- a/internal/rosa/package/iproute2.az +++ b/internal/rosa/package/iproute2.az @@ -21,7 +21,7 @@ package iproute2 { chmod = true; exec = make { - inPlace = true; + chdir = false; // drop default autoconf options configureName = "./configure"; configure = { @@ -30,7 +30,7 @@ package iproute2 { }; make = [ "CC=cc", "YACC=yacc" ]; // wants root - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/kernel/package.az b/internal/rosa/package/kernel/package.az index df1a0ffa..dd08063f 100644 --- a/internal/rosa/package/kernel/package.az +++ b/internal/rosa/package/kernel/package.az @@ -25,8 +25,8 @@ package kernel-headers { toyboxEarly = true; exec = make { - omitDefaults = true; - skipConfigure = true; + defaults = false; + configure = nil; make = [ "-f /usr/src/kernel-headers/Makefile", "O=/tmp/kbuild", @@ -35,7 +35,7 @@ package kernel-headers { "INSTALL_HDR_PATH=/work/system", "headers_install", ]; - skipCheck = true; + check = nil; install = ` cat \ /usr/src/version.h > \ @@ -86,11 +86,12 @@ install -Dm0500 \ exclusive = true; exec = make { - omitDefaults = true; - skipConfigure = true; + defaults = false; + + configure = nil; // Build, install, and boot kernel before running kselftest on it. - skipCheck = true; + check = nil; make = [ "-f /usr/src/kernel/Makefile", @@ -154,7 +155,7 @@ package gen_init_cpio { enterSource = true; exec = generic { - inPlace = true; + chdir = false; build = ` mkdir -p /work/system/bin/ cc -o /work/system/bin/gen_init_cpio usr/gen_init_cpio.c diff --git a/internal/rosa/package/kmod.az b/internal/rosa/package/kmod.az index d5b99ecb..c56ba846 100644 --- a/internal/rosa/package/kmod.az +++ b/internal/rosa/package/kmod.az @@ -22,7 +22,7 @@ package kmod { }; // makes assumptions about the running kernel - skipTest = true; + test = false; }; inputs = [ diff --git a/internal/rosa/package/libaio.az b/internal/rosa/package/libaio.az index b7982869..7be4a855 100644 --- a/internal/rosa/package/libaio.az +++ b/internal/rosa/package/libaio.az @@ -18,8 +18,8 @@ package libaio { env = [ "PATH=/system/sbin" ]; bin = [ "bash" ]; exec = make { - inPlace = true; - skipConfigure = true; + chdir = false; + configure = nil; preCheck = "rm harness/cases/20.t; "+ // flaky "CFLAGS='"+ "-Wno-unknown-warning-option "+ diff --git a/internal/rosa/package/libbpf.az b/internal/rosa/package/libbpf.az index 14b3d0bf..9a10bc45 100644 --- a/internal/rosa/package/libbpf.az +++ b/internal/rosa/package/libbpf.az @@ -16,9 +16,9 @@ package libbpf { chmod = true; exec = make { - inPlace = true; - skipConfigure = true; - skipCheck = true; + chdir = false; + configure = nil; + check = nil; install = "make DESTDIR=/work LIBSUBDIR=lib install"; }; diff --git a/internal/rosa/package/libcap.az b/internal/rosa/package/libcap.az index 6f6eb355..be48ed01 100644 --- a/internal/rosa/package/libcap.az +++ b/internal/rosa/package/libcap.az @@ -23,18 +23,10 @@ package libcap { bin = [ "bash" ]; exec = make { - skipConfigure = true; - inPlace = true; - - make = [ - "CC=cc", - "all", - ]; - - check = [ - "CC=cc", - "test", - ]; + chdir = false; + configure = nil; + make = [ "CC=cc", "all" ]; + check = [ "CC=cc", "test" ]; }; inputs = [ diff --git a/internal/rosa/package/libucontext.az b/internal/rosa/package/libucontext.az index c063f9b1..4af0a68f 100644 --- a/internal/rosa/package/libucontext.az +++ b/internal/rosa/package/libucontext.az @@ -16,13 +16,11 @@ package libucontext { enterSource = true; exec = make { - omitDefaults = true; - skipConfigure = true; - inPlace = true; + defaults = false; + chdir = false; - make = [ - "ARCH=" + linuxArch, - ]; + configure = nil; + make = [ "ARCH=" + linuxArch ]; install = "make prefix=/system DESTDIR=/work install"; }; } diff --git a/internal/rosa/package/libxslt.az b/internal/rosa/package/libxslt.az index 37f74dbe..10114def 100644 --- a/internal/rosa/package/libxslt.az +++ b/internal/rosa/package/libxslt.az @@ -15,7 +15,7 @@ package libxslt { generate = "NOCONFIGURE=1 ./autogen.sh"; // python libxml2 cyclic dependency - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/lit.az b/internal/rosa/package/lit.az index c4d60062..846b5fe6 100644 --- a/internal/rosa/package/lit.az +++ b/internal/rosa/package/lit.az @@ -7,7 +7,7 @@ package lit { exec = pip { append = [ "llvm", "utils", "lit" ]; // already checked during llvm - skipCheck = true; + check = nil; }; inputs = [ python-setuptools ]; diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az index 352dca53..39b6947a 100644 --- a/internal/rosa/package/llvm/package.az +++ b/internal/rosa/package/llvm/package.az @@ -56,7 +56,7 @@ message(NOTICE "${LLVM_VERSION_MAJOR}") "COMPILER_RT_BUILD_PROFILE": "OFF"; "COMPILER_RT_BUILD_XRAY": "OFF"; }; - skipTest = true; + test = nil; postInstall = ` mkdir -p "/work/system/lib/clang/$LLVM_VERSION_MAJOR/lib/" ln -s \ @@ -119,7 +119,7 @@ package early-runtimes { "LLVM_ENABLE_ZSTD": "FORCE_ON"; "LLVM_ENABLE_LIBXML2": "OFF"; }; - skipTest = true; + test = nil; }; inputs = [ diff --git a/internal/rosa/package/lm_sensors.az b/internal/rosa/package/lm_sensors.az index 4b0486f2..8edc2447 100644 --- a/internal/rosa/package/lm_sensors.az +++ b/internal/rosa/package/lm_sensors.az @@ -17,20 +17,10 @@ package lm_sensors { bin = [ "perl" ]; populateUsrBin = true; exec = make { - inPlace = true; - skipConfigure = true; - - make = [ - "CC=cc", - "ETCDIR=/system/etc", - "PREFIX=/system", - ]; - - check = [ - "CC=cc", - "check", - ]; - + chdir = false; + configure = nil; + make = [ "CC=cc", "ETCDIR=/system/etc", "PREFIX=/system" ]; + check = [ "CC=cc", "check" ]; install = "make DESTDIR=/work PREFIX=/system install"; }; diff --git a/internal/rosa/package/lua/package.az b/internal/rosa/package/lua/package.az index 4f944179..ab74dfdd 100644 --- a/internal/rosa/package/lua/package.az +++ b/internal/rosa/package/lua/package.az @@ -20,8 +20,8 @@ package lua { chmod = true; exec = make { - inPlace = true; - skipConfigure = true; + chdir = false; + configure = nil; make = [ "CC='clang -fPIC'", "all" ]; check = [ "test" ]; install = ` diff --git a/internal/rosa/package/lvm2/package.az b/internal/rosa/package/lvm2/package.az index b8da5ec4..69e7f98e 100644 --- a/internal/rosa/package/lvm2/package.az +++ b/internal/rosa/package/lvm2/package.az @@ -16,7 +16,7 @@ package lvm2 { exec = make { // requires root - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/musl/package.az b/internal/rosa/package/musl/package.az index 253a0bfa..3207ecde 100644 --- a/internal/rosa/package/musl/package.az +++ b/internal/rosa/package/musl/package.az @@ -23,14 +23,9 @@ package musl-headers { ]; exec = make { - omitDefaults = true; - skipCheck = true; - - make = [ - "DESTDIR=/work", - "install-headers", - ]; - + defaults = false; + make = [ "DESTDIR=/work", "install-headers" ]; + check = nil; install = "# headers installed during make"; }; @@ -53,9 +48,8 @@ package musl { ]; exec = make { - omitDefaults = true; - skipCheck = true; - + defaults = false; + check = nil; postInstall = ` mkdir -p /work/system/bin COMPAT_LINKER_NAME="ld-musl-` + linuxArch + `.so.1" diff --git a/internal/rosa/package/ncurses.az b/internal/rosa/package/ncurses.az index 077caa15..189d8fb5 100644 --- a/internal/rosa/package/ncurses.az +++ b/internal/rosa/package/ncurses.az @@ -19,7 +19,7 @@ package ncurses { }; // "tests" are actual demo programs, not a test suite. - skipCheck = true; + check = nil; postInstall = ` find /work/system/lib \ diff --git a/internal/rosa/package/noto.az b/internal/rosa/package/noto.az index ee0030b2..64d27a58 100644 --- a/internal/rosa/package/noto.az +++ b/internal/rosa/package/noto.az @@ -12,7 +12,7 @@ package noto { enterSource = true; exec = generic { - inPlace = true; + chdir = false; install = ` DEST=/work/system/share/fonts/noto for font in $(ls -d fonts/*/); do diff --git a/internal/rosa/package/nss.az b/internal/rosa/package/nss.az index fd706f09..28050036 100644 --- a/internal/rosa/package/nss.az +++ b/internal/rosa/package/nss.az @@ -38,10 +38,9 @@ package nss { early = "\nln -s extra/nspr/nspr /usr/src/nspr\nchmod +w ../nspr/\n"; exec = make { - omitDefaults = true; - skipConfigure = true; - inPlace = true; - + defaults = false; + chdir = false; + configure = nil; make = [ "CCC=clang++", "NSDISTMODE=copy", @@ -49,7 +48,7 @@ package nss { "USE_64=1", "nss_build_all", ]; - skipCheck = true; + check = nil; install = ` cp -r \ /usr/src/dist/. \ @@ -80,7 +79,7 @@ package nss-cacert { enterSource = true; exec = generic { - inPlace = true; + chdir = false; build = ` mkdir -p /work/system/etc/ssl/{certs/unbundled,certs/hashed,trust-source} buildcatrust \ diff --git a/internal/rosa/package/openssl.az b/internal/rosa/package/openssl.az index ad877f46..907d394a 100644 --- a/internal/rosa/package/openssl.az +++ b/internal/rosa/package/openssl.az @@ -21,7 +21,7 @@ package openssl { ]; exec = make { - omitDefaults = true; + defaults = false; configureName = "/usr/src/openssl/Configure"; configure = { diff --git a/internal/rosa/package/pango.az b/internal/rosa/package/pango.az index f61e2f7d..48f3ef0f 100644 --- a/internal/rosa/package/pango.az +++ b/internal/rosa/package/pango.az @@ -18,7 +18,7 @@ package pango { "cairo": "enabled"; }; // Fontconfig error: Cannot load default config file: File not found: /etc/fonts/fonts.conf - skipTest = true; + test = false; }; inputs = [ diff --git a/internal/rosa/package/perl.az b/internal/rosa/package/perl.az index d722d0f9..c2539ee3 100644 --- a/internal/rosa/package/perl.az +++ b/internal/rosa/package/perl.az @@ -28,8 +28,8 @@ disable_test ext/POSIX/t/time.t toyboxEarly = true; exec = make { - omitDefaults = true; - inPlace = true; + defaults = false; + chdir = false; configureName = "./Configure"; configure = { @@ -70,7 +70,7 @@ package perl-Module-Build { chmod = true; exec = generic { - inPlace = true; + chdir = false; build = ` perl Build.PL --prefix=/system ./Build build`; diff --git a/internal/rosa/package/python/package.az b/internal/rosa/package/python/package.az index eb159e10..dc1e3fca 100644 --- a/internal/rosa/package/python/package.az +++ b/internal/rosa/package/python/package.az @@ -162,7 +162,7 @@ package python-setuptools { // error: invalid command 'dist_info' buildIsolation = true; // pytest circular dependency - skipCheck = true; + check = nil; }; runtime = [ python ]; @@ -212,7 +212,7 @@ package python-vcs-versioning { // upstream is monorepo of two packages (setuptools-scm) append = [ "vcs-versioning" ]; // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ @@ -246,7 +246,7 @@ package python-setuptools-scm { // upstream is monorepo of two packages append = [ "setuptools-scm" ]; // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ @@ -276,7 +276,7 @@ package python-flit-core { // upstream has other unused packages with many dependencies append = [ "flit_core" ]; // pytest circular dependency - skipCheck = true; + check = nil; }; runtime = [ python ]; @@ -296,7 +296,7 @@ package python-packaging { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-flit-core ]; @@ -317,7 +317,7 @@ package python-pathspec { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-flit-core ]; @@ -338,7 +338,7 @@ package python-trove-classifiers { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-setuptools ]; @@ -363,7 +363,7 @@ package python-pluggy { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-setuptools-scm ]; @@ -386,7 +386,7 @@ package python-hatchling { // upstream has other unused packages with many dependencies append = [ "backend" ]; // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ @@ -418,7 +418,7 @@ package python-pygments { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-hatchling ]; @@ -443,7 +443,7 @@ package python-iniconfig { exec = pip { // pytest circular dependency - skipCheck = true; + check = nil; }; inputs = [ python-setuptools-scm ]; @@ -468,7 +468,7 @@ package python-pytest { exec = pip { // many dependencies - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/rsync.az b/internal/rosa/package/rsync.az index 8bb06bcb..ad70284e 100644 --- a/internal/rosa/package/rsync.az +++ b/internal/rosa/package/rsync.az @@ -15,7 +15,8 @@ package rsync { toyboxEarly = true; exec = make { - omitDefaults = true; + defaults = false; + configure = { "disable-openssl"; "disable-xxhash"; @@ -24,6 +25,6 @@ package rsync { }; // circular dependency - skipCheck = true; + check = nil; }; } diff --git a/internal/rosa/package/spirv.az b/internal/rosa/package/spirv.az index 0ca1607d..1a6d19c6 100644 --- a/internal/rosa/package/spirv.az +++ b/internal/rosa/package/spirv.az @@ -14,7 +14,7 @@ package spirv-headers { exec = cmake { // upstream has no tests - skipTest = true; + test = nil; }; } diff --git a/internal/rosa/package/squashfs-tools.az b/internal/rosa/package/squashfs-tools.az index a645415f..b266e3fe 100644 --- a/internal/rosa/package/squashfs-tools.az +++ b/internal/rosa/package/squashfs-tools.az @@ -28,10 +28,9 @@ package squashfs-tools { early = "cd squashfs-tools"; exec = make { - skipConfigure = true; - inPlace = true; - - skipCheck = true; + chdir = false; + configure = nil; + check = nil; install = "make INSTALL_PREFIX=/work/system install"; }; diff --git a/internal/rosa/package/tamago.az b/internal/rosa/package/tamago.az index 3270ff69..e239f2a9 100644 --- a/internal/rosa/package/tamago.az +++ b/internal/rosa/package/tamago.az @@ -19,7 +19,7 @@ package tamago { enterSource = true; exec = generic { - inPlace = true; + chdir = false; build = ` mkdir /work/system/ cp -r . /work/system/tamago diff --git a/internal/rosa/package/toybox.az b/internal/rosa/package/toybox.az index ad648ecf..f54db3d2 100644 --- a/internal/rosa/package/toybox.az +++ b/internal/rosa/package/toybox.az @@ -22,10 +22,10 @@ package toybox { toyboxEarly = true; exec = make { - omitDefaults = true; - inPlace = true; - skipConfigure = true; + defaults = false; + chdir = false; + configure = nil; preMake = ` LDFLAGS="${LDFLAGS:-''} -static" @@ -50,7 +50,7 @@ sed -i \ "USER=cure", "tests", ]; - skipEarlyStageCheck = true; + checkEarly = false; install = "PREFIX=/work/system/bin make install_flat"; @@ -80,10 +80,10 @@ package toybox-early { toyboxEarly = true; exec = make { - omitDefaults = true; - inPlace = true; - skipConfigure = true; + defaults = false; + chdir = false; + configure = nil; preMake = ` LDFLAGS="${LDFLAGS:-''} -static" @@ -115,7 +115,7 @@ CONFIG_DIFF=y "USER=cure", "tests", ]; - skipEarlyStageCheck = true; + checkEarly = false; install = "PREFIX=/work/system/bin make install_flat"; diff --git a/internal/rosa/package/unzip.az b/internal/rosa/package/unzip.az index 9286b069..6fda9763 100644 --- a/internal/rosa/package/unzip.az +++ b/internal/rosa/package/unzip.az @@ -20,7 +20,7 @@ package unzip { chmod = true; exec = generic { - inPlace = true; + chdir = false; build = `unix/configure make -f unix/Makefile generic1`; install = ` diff --git a/internal/rosa/package/util-linux.az b/internal/rosa/package/util-linux.az index 916fd95f..405f2ab7 100644 --- a/internal/rosa/package/util-linux.az +++ b/internal/rosa/package/util-linux.az @@ -47,7 +47,7 @@ package util-linux { // check script claims: // For development purpose only. // Don't execute on production system! - skipCheck = true; + check = nil; }; inputs = [ diff --git a/internal/rosa/package/vim.az b/internal/rosa/package/vim.az index 7f78b063..1ea7883c 100644 --- a/internal/rosa/package/vim.az +++ b/internal/rosa/package/vim.az @@ -17,14 +17,14 @@ package vim { enterSource = true; exec = make { - inPlace = true; + chdir = false; configure = { "with-tlib": "ncursesw"; }; check = [ "test" ]; // very expensive - skipCheck = true; + check = nil; }; inputs = [ ncurses ]; diff --git a/internal/rosa/state.go b/internal/rosa/state.go index 767038ba..73a40b6e 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -811,14 +811,17 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr GenericHelper + chdir := true if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ - k("inPlace"): &attr.InPlace, + k("chdir"): &chdir, k("build"): &attr.Build, k("check"): &attr.Check, k("install"): &attr.Install, }); err != nil { return } + attr.InPlace = !chdir + v = &attr set = true return @@ -828,28 +831,33 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr MakeHelper + defaults, chdir, checkEarly := true, true, true + attr.Configure, attr.Check = []KV{}, []string{} if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ - k("omitDefaults"): &attr.OmitDefaults, + k("defaults"): &defaults, k("generate"): &attr.Generate, k("preMake"): &attr.ScriptMakeEarly, k("preCheck"): &attr.ScriptCheckEarly, k("postInstall"): &attr.Script, - k("inPlace"): &attr.InPlace, - k("skipConfigure"): &attr.SkipConfigure, + k("chdir"): &chdir, k("configureName"): &attr.ConfigureName, k("forceAutoconf"): &attr.ForceAutoconf, k("configure"): &attr.Configure, k("host"): &attr.Host, k("build"): &attr.Build, k("make"): &attr.Make, - k("skipCheck"): &attr.SkipCheck, k("check"): &attr.Check, k("install"): &attr.Install, - k("skipEarlyStageCheck"): &attr.SkipCheckEarly, + k("checkEarly"): &checkEarly, }); err != nil { return } + attr.OmitDefaults, attr.InPlace = !defaults, !chdir + attr.SkipConfigure = attr.Configure == nil + attr.SkipCheck = attr.Check == nil + attr.SkipCheckEarly = !checkEarly + v = &attr set = true return @@ -859,17 +867,20 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr CMakeHelper + var test azalea.AString if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ k("append"): &attr.Append, k("buildType"): &attr.BuildType, k("cache"): &attr.Cache, k("postInstall"): &attr.Script, - k("test"): &attr.Test, - k("skipTest"): &attr.SkipTest, + k("test"): &test, k("make"): &attr.Make, }); err != nil { return } + attr.Test = test.V + attr.SkipTest = test.Nil + v = &attr set = true return @@ -879,18 +890,21 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr MesonHelper + test := true if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ k("muon"): &attr.Muon, k("preCompile"): &attr.ScriptCompileEarly, k("postCompile"): &attr.ScriptCompiled, k("postInstall"): &attr.Script, k("setup"): &attr.Setup, - k("skipTest"): &attr.SkipTest, + k("test"): &test, k("skipTests"): &attr.SkipTests, k("interactiveTest"): &attr.InteractiveTest, }); err != nil { return } + attr.SkipTest = !test + v = &attr set = true return @@ -900,11 +914,13 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr MakeMakerHelper + doCheck := true if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ - k("skipCheck"): &attr.SkipCheck, + k("check"): &doCheck, }); err != nil { return } + attr.SkipCheck = !doCheck v = &attr set = true return @@ -914,17 +930,20 @@ func (s *S) getFrame() azalea.Frame { args azalea.FArgs, ) (v any, set bool, err error) { var attr PipHelper + var scriptCheck azalea.AString if err = args.Apply(map[unique.Handle[azalea.Ident]]any{ k("append"): &attr.Append, k("buildIsolation"): &attr.BuildIsolation, k("enterSource"): &attr.EnterSource, k("install"): &attr.Install, - k("skipCheck"): &attr.SkipCheck, - k("check"): &attr.Check, + k("check"): &scriptCheck, k("postInstall"): &attr.Script, }); err != nil { return } + attr.Check = scriptCheck.V + attr.SkipCheck = scriptCheck.Nil + v = &attr set = true return