jinx: upgrade and fix build

recipes/ace-of-penguins

@@ -1,12 +1,15 @@
 name=ace-of-penguins
 revision=1
 from_source=ace-of-penguins
-imagedeps="meson ninja base-devel libpng"
+imagedeps="meson build-essential libpng-dev"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxpm libpng zlib"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/astral

@@ -1,7 +1,7 @@
 name=astral
 revision=1
 from_source=astral
-imagedeps="base-devel nasm"
+imagedeps="build-essential nasm"
 hostdeps="xgcc xbinutils limine"
 
 build() {

recipes/bash

@@ -1,13 +1,16 @@
 name=bash
 revision=1
 from_source=bash
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="readline base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --without-bash-malloc
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/binutils

@@ -1,12 +1,15 @@
 name=binutils
 revision=1
 from_source=binutils
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils automake autoconf"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --program-prefix=x86_64-astral- --disable-werror
+}
+
+build() {
 	make -j${parallelism} tooldir=/usr
 }
 

recipes/bzip2

@@ -1,7 +1,7 @@
 name=bzip2
 revision=1
 from_source=bzip2
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 

recipes/coreutils

@@ -1,13 +1,16 @@
 name=coreutils
 revision=1
 from_source=coreutils
-imagedeps="base-devel gperf"
+imagedeps="build-essential gperf"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -pr ${source_dir}/* .
 	CFLAGS="-DSLOW_BUT_NO_HACKS $CFLAGS" ./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/curl

@@ -1,13 +1,16 @@
 name=curl
 revision=1
 from_source=curl
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base openssl zlib"
 
-build() {
+configure() {
 	cp -rpv ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --with-openssl --with-zlib --disable-ipv6 --with-ca-path=/etc/ssl/certs --disable-static
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/diffutils

@@ -1,13 +1,16 @@
 name=diffutils
 revision=1
 from_source=diffutils
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --disable-docs
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/doomgeneric

@@ -1,7 +1,7 @@
 name=doomgeneric
 revision=1
 from_source=doomgeneric
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 

recipes/doomgeneric-x11

@@ -1,7 +1,7 @@
 name=doomgeneric-x11
 revision=1
 from_source=doomgeneric
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base libx11"
 

recipes/e2fsprogs

@@ -1,12 +1,15 @@
 name=e2fsprogs
 revision=1
 from_source=e2fsprogs
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/file

@@ -1,13 +1,16 @@
 name=file
 revision=1
 from_source=file
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/findutils

@@ -1,13 +1,16 @@
 name=findutils
 revision=1
 from_source=findutils
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/fontconfig

@@ -1,12 +1,15 @@
 name=fontconfig
 revision=1
 from_source=fontconfig
-imagedeps="base-devel python3 gperf"
+imagedeps="build-essential python3 gperf"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base freetype libexpat"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/fontutil

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorgproto"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/freetype

@@ -1,12 +1,15 @@
 name=freetype
 revision=1
 from_source=freetype
-imagedeps="gcc"
+imagedeps="gcc build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/frigg

@@ -2,10 +2,13 @@ name=frigg
 from_source=frigg
 revision=1
 hostdeps="xgcc xbinutils pkgconfig"
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
+
+configure() {
+        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dbuild_tests=disabled ${source_dir} --includedir="share/mlibc-build/frigg/include"
+}
 
 build() {
-        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dbuild_tests=disabled ${source_dir} --includedir="share/mlibc-build/frigg/include"
         ninja
 }
 

recipes/fvwm

@@ -1,18 +1,20 @@
 name=fvwm
 revision=1
 from_source=fvwm
-imagedeps="base-devel"
-hostdeps="xgcc xbinutils pkgconfig"
+imagedeps="build-essential"
+hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base libx11 libxinerama libxcursor libxt libevent libxrandr freetype libpng libxft"
 
-build() {
+configure() {
 	cp -rvp ${source_dir}/* .
 	ac_cv_func_setpgrp_void=yes \
 	ac_cv_func_mkstemp=yes \
 	has_safety_mkstemp=yes \
 	./configure --prefix=${prefix} --host=x86_64-astral
+}
 
-	make -j${parallelism}
+build() {
+	 make -j${parallelism} libevent_LIBS="-levent"
 }
 
 package() {

recipes/gawk

@@ -1,11 +1,11 @@
 name=gawk
 revision=1
 from_source=gawk
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --disable-nls --disable-extensions
 
@@ -15,7 +15,9 @@ build() {
 	echo "	echo ignore" >> test/Makefile
 	echo "install:" >> test/Makefile
 	echo "	echo ignore" >> test/Makefile
+}
 
+build() {
 	make -j ${parallelism}
 }
 

recipes/gcc

@@ -1,12 +1,15 @@
 name=gcc
 revision=1
 from_source=gcc
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostrundeps="automake autoconf xgcc xbinutils libstdc++-v3"
 deps="base gmp mpfr mpc binutils"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --enable-languages=c,c++ --with-sysroot=/ --with-build-sysroot=${sysroot_dir}
+}
+
+build() {
 	make -j${parallelism} all-gcc all-target-libgcc all-target-libstdc++-v3
 }
 

recipes/gettext

@@ -1,14 +1,17 @@
 name=gettext
 revision=1
 from_source=gettext
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils autoconf automake pkgconfig libtool"
 deps="base libiconv"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 
 	ACLOCAL=true AUTCONF=true AUTOMAKE=true AUTOHEADER=true ./configure --host=x86_64-astral --prefix=${prefix} --disable-static
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/git

@@ -1,13 +1,16 @@
 name=git
 revision=1
 from_source=git
-imagedeps="base-devel"
+imagedeps="build-essential curl libcurl4-openssl-dev"
 hostdeps="xgcc xbinutils"
 deps="base python zlib curl openssl openssh"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	ac_cv_iconv_omits_bom=yes ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no ./configure --host=x86_64-astral --prefix=${prefix} --with-gitconfig=/etc/gitconfig --with-python=python3
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/glib

@@ -1,12 +1,15 @@
 name=glib
 revision=1
 from_source=glib
-imagedeps="gcc meson ninja"
+imagedeps="gcc meson ninja-build"
 hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool"
 deps="base libiconv pcre2 libffi libintl"
 
-build() {
+configure() {
 	meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release -Dxattr=false ${source_dir}
+}
+
+build() {
 	ninja -j${parallelism}
 }
 

recipes/glu

@@ -1,13 +1,15 @@
 name=glu
 revision=1
 from_source=glu
-imagedeps="gcc meson ninja"
+imagedeps="gcc meson ninja-build"
 hostdeps="xgcc xbinutils pkgconfig libtool libstdc++-v3"
 deps="base mesa"
 
-build() {
+configure() {
 	meson setup --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release ${source_dir} -Dgl_provider=gl
+}
 
+build() {
 	ninja -j${parallelism}
 }
 

recipes/gmp

@@ -1,12 +1,15 @@
 name=gmp
 revision=1
 from_source=gmp
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/grep

@@ -1,13 +1,16 @@
 name=grep
 revision=1
 from_source=grep
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/gzip

@@ -1,13 +1,16 @@
 name=gzip
 revision=1
 from_source=gzip
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils automake autoconf"
 deps="base"
 
-build() {
+configure() {
 	cp -rf ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/imlib2

@@ -1,12 +1,15 @@
 name=imlib2
 revision=1
 from_source=imlib2
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils libtool pkgconfig"
 deps="base freetype libx11 libice libpng libjpeg-turbo bzip2 zlib libxext"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/init

@@ -1,7 +1,7 @@
 name=init
 revision=1
 from_source=init
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xbinutils xgcc"
 deps="base"
 

recipes/less

@@ -1,12 +1,15 @@
 name=less
 revision=1
 from_source=less
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base ncurses"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism} #LDFLAGS='-ltinfo'
 }
 

recipes/libXau

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorgproto"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libXdmcp

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorgproto"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libevent

@@ -1,12 +1,15 @@
 name=libevent
 revision=1
 from_source=libevent
-imagedeps="base-devel"
-hostdeps="xgcc xbinutils"
+imagedeps="build-essential"
+hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --enable-shared --disable-openssl
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libexpat

@@ -1,12 +1,15 @@
 name=libexpat
 revision=1
 from_source=libexpat
-imagedeps="base-devel python3"
+imagedeps="build-essential python3"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base"
 
-build() {
+configure() {	
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libffi

@@ -1,12 +1,15 @@
 name=libffi
 revision=1
 from_source=libffi
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils autoconf automake pkgconfig libtool"
 deps="base ncurses"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --enable-shared
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libfontenc

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base zlib xorgproto"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libgcrypt

@@ -1,17 +1,20 @@
 name=libgcrypt
 revision=1
 from_source=libgcrypt
-imagedeps="meson ninja gcc"
+imagedeps="meson ninja-build gcc build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base libgpg-error"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral \
         --enable-shared \
         --disable-doc \
         --disable-dev-random \
         --disable-asm \
         --with-libgpg-error-prefix=${sysroot_dir}/${prefix}
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libgpg-error

@@ -1,12 +1,15 @@
 name=libgpg-error
 revision=1
 from_source=libgpg-error
-imagedeps="gcc"
+imagedeps="gcc build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="mlibc"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libice

@@ -1,13 +1,15 @@
 name=libice
 revision=1
 from_source=libice
-imagedeps="meson ninja base-devel"
+imagedeps="meson build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11"
 
+configure() {
+	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
 
 build() {
-	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
 	make -j${parallelism}
 }
 

recipes/libiconv

@@ -1,12 +1,15 @@
 name=libiconv
 revision=1
 from_source=libiconv
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils libstdc++-v3 pkgconfig libtool"
 deps="mlibc"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-nls --enable-shared --disable-static
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libintl

@@ -1,16 +1,19 @@
 name=libintl
 revision=1
 from_source=gettext
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils libstdc++-v3 automake autoconf pkgconfig libtool"
 deps="mlibc"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 
 	ACLOCAL=true AUTCONF=true AUTOMAKE=true AUTOHEADER=true ./configure \
 	--host=x86_64-astral --prefix=${prefix} --without-emacs --without-lispdir --enable-nls --with-included-gettext --disable-c++ --disable-libasprintf --disable-java --enable-threads=posix --disable-curses --without-git --without-cvs --without-bzip2 --without-xz --disable-static
 	sed -i 's/touch $@//g' gettext-runtime/intl/Makefile
+}
+
+build() {
 	make -C gettext-runtime/intl -j${parallelism}
 }
 

recipes/libjpeg-turbo

@@ -1,11 +1,11 @@
 name=libjpeg-turbo
 revision=1
 from_source=libjpeg-turbo
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils cmake"
 deps="base"
 
-build() {
+configure() {
 	cmake \
 	-DCMAKE_TOOLCHAIN_FILE=${base_dir}/util/cmake \
 	-DCMAKE_INSTALL_PREFIX=${prefix} \
@@ -16,7 +16,9 @@ build() {
 	-DWITH_JPEG8=ON \
 	-DCMAKE_SYSTEM_PROCESSOR=x86_64 \
 	${source_dir}
+}
 
+build() {
 	make -j${parallelism}
 }
 

recipes/libpng

@@ -1,12 +1,15 @@
 name=libpng
 revision=1
 from_source=libpng
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base zlib"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libsm

@@ -1,12 +1,15 @@
 name=libsm
 revision=1
 from_source=libsm
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base xorgproto libx11 libice"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libx11

@@ -1,12 +1,15 @@
 name=libx11
 revision=1
 from_source=libx11
-imagedeps="meson ninja gcc"
+imagedeps="meson ninja-build gcc build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorgproto xtrans libxcb"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxaw

@@ -1,12 +1,15 @@
 name=libxaw
 revision=1
 from_source=libxaw
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxt libxext libxmu libxpm"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxcb

@@ -1,12 +1,15 @@
 name=libxcb
 revision=1
 from_source=libxcb
-imagedeps="python gcc"
+imagedeps="python3 gcc"
 hostdeps="xgcc xbinutils pkgconfig util-macros libtool autoconf automake"
 deps="base xorgproto libXau libXdmcp xcb-proto"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --with-sysroot=${sysroot_dir}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libxcrypt

@@ -1,12 +1,15 @@
 name=libxcrypt
 revision=1
 from_source=libxcrypt
-imagedeps="python-passlib gcc"
+imagedeps="python3-passlib gcc"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="mlibc libgpg-error libiconv libintl"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-obsolete-api=yes --disable-xcrypt-compat-files
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxcursor

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libxrender libxfixes libx11"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxcvt

@@ -1,12 +1,15 @@
 name=libxcvt
 revision=1
 from_source=libxcvt
-imagedeps="meson ninja gcc"
+imagedeps="meson ninja-build gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base"
 
-build() {
+configure() {
 	meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} ${source_dir}
+}
+
+build() {
 	ninja
 }
 

recipes/libxdamage

@@ -1,12 +1,15 @@
 name=libxdamage
 revision=1
 from_source=libxdamage
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxfixes"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxext

@@ -1,12 +1,15 @@
 name=libxext
 revision=1
 from_source=libxext
-imagedeps="meson ninja base-devel"
+imagedeps="meson build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxfixes

@@ -1,12 +1,15 @@
 name=libxfixes
 revision=1
 from_source=libxfixes
-imagedeps="meson ninja base-devel"
+imagedeps="meson build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxfont2

@@ -1,12 +1,15 @@
 name=libxfont2
 revision=1
 from_source=libxfont2
-imagedeps="meson ninja gcc"
+imagedeps="meson ninja-build gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorgproto freetype zlib xtrans libfontenc"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxft

@@ -1,7 +1,7 @@
 name=libxft
 revision=1
 from_source=libxft
-imagedeps="meson ninja base-devel"
+imagedeps="meson build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxt libxrender freetype fontconfig"
 

recipes/libxi

@@ -1,12 +1,15 @@
 name=libxi
 revision=1
 from_source=libxi
-imagedeps="meson ninja base-devel"
+imagedeps="meson build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxext libxfixes"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxinerama

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base xorgproto libx11 libxext"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxml

@@ -1,12 +1,15 @@
 name=libxml
 revision=1
 from_source=libxml
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base zlib"
 
-build() {
+configure () {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --without-python --disable-static --with-threads --disable-ipv6
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/libxmu

@@ -1,12 +1,15 @@
 name=libxmu
 revision=1
 from_source=libxmu
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxt libxext"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxpm

@@ -1,12 +1,15 @@
 name=libxpm
 revision=1
 from_source=libxpm
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11 libxt libxext libxmu libxrender"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxrandr

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base libx11 xorgproto util-macros libxext libxrender"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxrender

@@ -1,12 +1,15 @@
 name=libxrender
 revision=1
 from_source=libxrender
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base libx11"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxt

@@ -1,12 +1,15 @@
 name=libxt
 revision=1
 from_source=libxt
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base xorgproto libx11 libice libsm"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/libxxf86vm

@@ -1,12 +1,15 @@
 name=libxxf86vm
 revision=1
 from_source=libxxf86vm
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig util-macros"
 deps="base libxext xorgproto"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/limine

@@ -1,12 +1,15 @@
 name=limine
 from_source=limine
 revision=1
-imagedeps="base-devel mtools nasm"
+imagedeps="build-essential mtools nasm"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	"${source_dir}/configure" --host=x86_64-astral --enable-bios-cd --enable-bios-pxe --enable-bios --enable-uefi-ia32 --enable-uefi-x86-64 --enable-uefi-cd --prefix="${prefix}"
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/links

@@ -1,12 +1,15 @@
 name=links
 revision=1
 from_source=links
-imagedeps="meson ninja base-devel libpng"
+imagedeps="meson ninja-build build-essential libpng-dev"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base zlib openssl bzip2 libpng libxext freetype fontconfig libjpeg-turbo"
 
-build() {
+configure() {
 	CC=x86_64-astral-gcc ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-graphics --without-directfb --without-librsvg --with-bzip2 --with-X --x-includes=${sysroot_dir}/usr/include --x-libraries=${sysroot_dir}/usr/lib --with-zlib --with-openssl --without-libtiff --without-openmp --without-lzma --with-freetype --without-ipv6
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/linux-headers

@@ -1,7 +1,7 @@
 name=linux-headers
 from_source=linux
 revision=1
-imagedeps="base-devel rsync"
+imagedeps="build-essential rsync"
 
 build() {
 	true

recipes/llvm

@@ -1,11 +1,11 @@
 name=llvm
 revision=1
 from_source=llvm
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig cmake libstdc++-v3"
 deps="base ncurses zlib"
 
-build() {
+configure() {
 	cmake \
 	-GNinja \
 	-DCMAKE_TOOLCHAIN_FILE=${base_dir}/util/cmake \
@@ -20,7 +20,9 @@ build() {
 	-DLLVM_TARGETS_TO_BUILD="X86" \
 	-Wno-dev \
 	${source_dir}/llvm
+}
 
+build() {
 	ninja -j${parallelism}
 }
 

recipes/make

@@ -1,13 +1,16 @@
 name=make
 revision=1
 from_source=make
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/mesa

@@ -1,16 +1,20 @@
 name=mesa
 revision=1
 from_source=mesa
-imagedeps="gcc meson ninja python-mako python-setuptools python-yaml"
+imagedeps="gcc meson ninja-build python3-mako python3-setuptools python3-yaml"
 hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool libstdc++-v3"
 deps="base llvm libexpat libxcb libx11 libxext zlib"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	mkdir -p build
 	cd build
 
 	meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release -Dplatforms=x11 -Dglx=xlib -Dgallium-drivers=swrast -Dvulkan-drivers= -Dllvm=enabled -Dvalgrind=disabled -Dlibunwind=disabled ..
+}
+
+build() {
+	cd build
 	ninja -j${parallelism}
 }
 

recipes/mesa-demos

@@ -1,13 +1,15 @@
 name=mesa-demos
 revision=1
 from_source=mesa-demos
-imagedeps="gcc meson ninja"
+imagedeps="gcc meson ninja-build"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base mesa freetype libx11 libxext glu"
 
-build() {
+configure() {
 	meson setup --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release ${source_dir} -Dx11=enabled -Dwith-system-data-files=true
+}
 
+build() {
 	ninja -j${parallelism}
 }
 

recipes/mkfontscale

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base freetype libfontenc"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/mlibc

@@ -3,11 +3,14 @@ from_source=mlibc
 revision=1
 hostdeps="xgcc xbinutils pkgconfig"
 builddeps="freestnd-c-hdrs freestnd-cxx-hdrs frigg"
-imagedeps="meson ninja git base-devel binutils"
+imagedeps="meson ninja-build git build-essential binutils"
 deps="mlibc-headers"
 
-build() {
+configure() {
         meson --cross-file ${base_dir}/util/crossfile -Dmlibc_no_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true
+}
+
+build() {
         ninja
 }
 

recipes/mlibc-headers

@@ -1,11 +1,14 @@
 name=mlibc-headers
 from_source=mlibc
 revision=1
-imagedeps="ninja meson base-devel rsync"
+imagedeps="ninja-build meson build-essential rsync"
 builddeps="linux-headers"
 
-build() {
+configure() {
 	meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}"  -Dheaders_only=true "${source_dir}" -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true
+}
+
+build() {
 	ninja
 	mkdir linux
 	cp -rp ${base_dir}/sources/linux/* linux

recipes/mount

@@ -1,7 +1,7 @@
 name=mount
 revision=1
 from_source=mount
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xbinutils xgcc"
 deps="base"
 

recipes/mpc

@@ -1,12 +1,15 @@
 name=mpc
 revision=1
 from_source=mpc
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base gmp mpfr"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/mpfr

@@ -1,13 +1,16 @@
 name=mpfr
 revision=1
 from_source=mpfr
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base gmp"
 
-build() {
+configure() {
 	cp -pr ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/nano

@@ -1,12 +1,15 @@
 name=nano
 revision=1
 from_source=nano
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base ncurses"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism} LDFLAGS='-ltinfo'
 }
 

recipes/nasm

@@ -1,12 +1,15 @@
 name=nasm
 revision=1
 from_source=nasm
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/ncurses

@@ -1,12 +1,15 @@
 name=ncurses
 revision=1
 from_source=ncurses
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils libstdc++-v3 pkgconfig libtool"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-shared --without-normal --with-termlib --enable-pc-files --enable-widec
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/netd

@@ -1,7 +1,7 @@
 name=netd
 revision=1
 from_source=netd
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xbinutils xgcc"
 deps="base"
 

recipes/nyancat

@@ -1,7 +1,7 @@
 name=nyancat
 revision=1
 from_source=nyancat
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 

recipes/openssh

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils"
 deps="base zlib openssl libxcrypt"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --sysconfdir=/etc/ssh --with-privsep-path=/var/lib/sshd --with-default-path=${prefix}/bin --with-superuser-path=${prefix}/sbin:${prefix}/bin --with-pid-dir=/run
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/openssl

@@ -5,9 +5,12 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils"
 deps="base zlib"
 
-build() {
+configure() {
 	cp -rpv ${source_dir}/* .
 	CC=x86_64-astral-gcc CXX=x86_64-astral-gcc ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib "x86_64-astral" shared zlib-dynamic no-afalgeng
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/oss

@@ -1,11 +1,11 @@
 name=oss
 revision=1
 from_source=oss
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() { 
+configure() {
 	ASTRAL_CC=x86_64-astral-gcc \
 	ASTRAL_HOSTCC=cc \
 	ASTRAL_CPLUSPLUS=x86_64-astral-g++ \
@@ -15,6 +15,9 @@ build() {
 	ASTRAL_OS=Astral \
 	ASTRAL_ARCH=x86_64 \
 	${source_dir}/configure --enable-libsalsa=NO --only-drv= --target=astral-x86_64
+}
+
+build() { 
 	CC=x86_64-astral-gcc make -j${parallelism}
 }
 

recipes/pcre2

@@ -5,8 +5,11 @@ imagedeps="gcc"
 hostdeps="xgcc xbinutils"
 deps="base zlib bzip2"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --docdir=/usr/share/doc/pcre2-10.42 --enable-pcre2-16 --enable-pcre2-32 --enable-pcre2grep-libz --enable-pcre2grep-libbz2 --disable-static
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/pixman

@@ -1,12 +1,15 @@
 name=pixman
 revision=1
 from_source=pixman
-imagedeps="meson ninja gcc"
+imagedeps="meson ninja-build gcc"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base"
 
-build() {
+configure() {
 	meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} ${source_dir}
+}
+
+build() {
 	ninja
 }
 

recipes/python

@@ -1,14 +1,17 @@
 name=python
 revision=1
 from_source=python
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig python"
 deps="base"
 
-build() {
+configure() {
 	echo "ac_cv_file__dev_ptmx=yes" > /tmp/configsite
 	echo "ac_cv_file__dev_ptc=no" >> /tmp/configsite
 	CONFIG_SITE=/tmp/configsite ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --build=x86_64 --with-build-python=python3 --disable-ipv6 --enable-shared
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/qemu

@@ -1,14 +1,17 @@
 name=qemu
 revision=1
 from_source=qemu
-imagedeps="base-devel python-sphinx ninja meson git"
+imagedeps="build-essential python3-venv python3-sphinx ninja-build meson git"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base sdl2 glib libiconv libintl"
 allow_network="yes"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --cross-prefix=x86_64-astral- --host=x86_64-astral --prefix=${prefix} --target-list=x86_64-softmmu,i386-softmmu,aarch64-softmmu --with-coroutine=sigaltstack --disable-pie
+}
+
+build() {
 	cd build
 	ninja -j${parallelism}
 }

recipes/readline

@@ -1,12 +1,15 @@
 name=readline
 revision=1
 from_source=readline
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base ncurses"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --enable-multibyte --disable-static --enable-shared
+}
+
+build() {
 	make -j${parallelism} SHLIB_LIBS="-lncursesw"
 }
 

recipes/sdl2

@@ -1,11 +1,11 @@
 name=sdl2
 revision=1
 from_source=sdl2
-imagedeps="meson ninja base-devel"
+imagedeps="meson ninja-build build-essential"
 hostdeps="xgcc xbinutils pkgconfig cmake libstdc++-v3"
 deps="base libx11 libxext libxcursor libxinerama libxi libxfixes libxrandr libxrender libxxf86vm mesa libiconv"
 
-build() {
+configure() {
 	cmake \
 	-GNinja \
 	-DCMAKE_TOOLCHAIN_FILE=${base_dir}/util/cmake \
@@ -44,7 +44,9 @@ build() {
 	-DSDL_SHARED=ON \
 	-DSDL_STATIC=OFF \
 	${source_dir}
+}
 
+build() {
 	ninja -j${parallelism}
 }
 

recipes/sed

@@ -1,13 +1,16 @@
 name=sed
 revision=1
 from_source=sed
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/shadow

@@ -1,11 +1,11 @@
 name=shadow
 revision=1
 from_source=shadow
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base libxcrypt"
 
-build() {
+configure() {
 	cp -rvfp ${source_dir}/* .
 	sed -i 's/groups$(EXEEXT) //' src/Makefile.in
 	find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;
@@ -14,6 +14,9 @@ build() {
 	sed -i 's/1000/999/' src/useradd.c
 	sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' -e 's:/var/spool/mail:/var/mail:' -i etc/login.defs
 	./configure --host=x86_64-astral --prefix=${prefix} --sysconfdir=/etc --with-group-name-max-length=32 --without-libbsd --disable-nls
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/sudo

@@ -1,12 +1,15 @@
 name=sudo
 revision=1
 from_source=sudo
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base libxcrypt"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-secure-path --with-env-editor --with-passprompt="[sudo] password for %p: " --disable-nls
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/tar

@@ -1,13 +1,16 @@
 name=tar
 revision=1
 from_source=tar
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base bzip2 zlib gzip"
 
-build() {
+configure() {
 	cp -rpf ${source_dir}/* .
 	LDFLAGS="${LDFLAGS} -lintl -liconv" ./configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/twm

@@ -1,12 +1,15 @@
 name=twm
 revision=1
 from_source=twm
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base xorg-server xsetroot"
 
-build() {
+configure() {
 	${source_dir}/configure --prefix=${prefix} --host=x86_64-astral
+}
+
+build() {
 	make -j${parallelism}
 }
 

recipes/tyrquake

@@ -1,12 +1,15 @@
 name=tyrquake
 revision=1
 from_source=tyrquake
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="base libx11 libxext libxxf86vm sdl2"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
+}
+
+build() {
 	make -j${parallelism} CC=x86_64-astral-gcc LFLAGS="-lc" V=1 LOCALBASE=${sysroot_dir} SDL_CFLAGS="-I${sysroot_dir}/${prefix}/include/SDL2" SDL_LFLAGS="-lSDL2" DEBUG=Y CD_TARGET=null CFLAGS=-msse2
 }
 

recipes/util-macros

@@ -1,12 +1,15 @@
 name=util-macros
 revision=1
 from_source=util-macros
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base"
 
-build() {
+configure() {
 	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/vim

@@ -1,11 +1,11 @@
 name=vim
 revision=1
 from_source=vim
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils"
 deps="ncurses base"
 
-build() {
+configure() {
 	cp -rp ${source_dir}/* .
 	vim_cv_toupper_broken="no" \
 	ac_cv_small_wchar_t="no" \
@@ -22,6 +22,9 @@ build() {
 	vim_cv_bcopy_handles_overlap="yes" \
 	vim_cv_memcpy_handles_overlap="yes" \
 	./configure --host=x86_64-astral --prefix=${prefix} --with-tlib=tinfo --disable-gtktest --disable-cion-cache-update --disable-desktop-database-update --disable-canberra --disable-selinux --disable-xsmp --disable-channel --disable-netbeans --enable-multibyte --disable-acl --disable-gpm --disable-sysmous --disable-nls --enable-gui="no" --without-x
+}
+
+build() {
 	make -j ${parallelism}
 }
 

recipes/wget

@@ -1,13 +1,16 @@
 name=wget
 revision=1
 from_source=wget
-imagedeps="base-devel"
+imagedeps="build-essential"
 hostdeps="xgcc xbinutils pkgconfig"
 deps="base zlib pcre2 openssl"
 
-build() {
+configure() {
 	cp -rpv ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --without-libpsl --with-ssl=openssl --disable-ipv6
+}
+
+build() {
 	make -j ${parallelism}
 }