fix clean builds

Makefile

@@ -14,7 +14,7 @@ all: jinx
 	make $(ISO)
 
 jinx:
-	curl https://raw.githubusercontent.com/mintsuki/jinx/trunk/jinx > jinx
+	curl https://raw.githubusercontent.com/mintsuki/jinx/87867554aa157115dde0899b1b8fd0bf9f949096/jinx > jinx
 	chmod +x jinx
 
 $(ISO): limine.cfg liminebg.bmp $(KERNEL) initrd

host-recipes/autoconf

@@ -3,14 +3,11 @@ revision=1
 from_source=autoconf
 imagedeps="gcc"
 
-configure() {
-	${source_dir}/configure --prefix="${prefix}"
-}
-
 build() {
+	${source_dir}/configure --prefix="${prefix}"
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

host-recipes/autoconf-archive

@@ -3,14 +3,11 @@ revision=1
 from_source=autoconf-archive
 imagedeps="gcc"
 
-configure() {
-	${source_dir}/configure --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --prefix=${prefix}
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

host-recipes/automake

@@ -4,14 +4,11 @@ from_source=automake
 imagedeps="gcc"
 hostdeps="autoconf"
 
-configure() {
-	${source_dir}/configure --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --prefix=${prefix}
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	 DESTDIR="${dest_dir}" make install
 }

host-recipes/libstdc++-v3

@@ -5,16 +5,13 @@ imagedeps="base-devel"
 hostdeps="automake autoconf xbinutils xgcc"
 deps="mlibc"
 
-configure() {
-	true
-}
-
 build() {
 	cd ${base_dir}/host-builds/xgcc
 	make all-target-libstdc++-v3 -j7
 }
 
-install(){
+package(){
 	cd ${base_dir}/host-builds/xgcc
 	make DESTDIR="${dest_dir}" install-target-libstdc++-v3
+	rm -rf ${dest_dir}/usr/local/lib/gcc/x86_64-astral/12.1.0/
 }

host-recipes/libtool

@@ -4,19 +4,14 @@ from_source=libtool
 hostdeps="autoconf automake"
 imagedeps="gcc help2man"
 
-
+build() {
-configure() {
 	cp -pr ${source_dir}/* .
 	./configure --prefix=${prefix}	
-}
-
-build() {
-	
 	make -j${parallelism}
 
 }
 
-install() {
+package() {
 
 	make install DESTDIR="${dest_dir}"
 

host-recipes/limine

@@ -3,15 +3,12 @@ from_source=limine
 revision=1
 imagedeps="base-devel mtools nasm"
 
-configure() {
+build() {
 	# check here for target in order to build aarch64 targets if ever ported
 	"${source_dir}/configure" --enable-bios-cd --enable-bios-pxe --enable-bios --enable-uefi-ia32 --enable-uefi-x86-64 --enable-uefi-cd --prefix="${prefix}"
-}
-
-build() {
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

host-recipes/pkgconfig

@@ -4,19 +4,12 @@ from_source=pkgconfig
 imagedeps="gcc base-devel"
 
 
-configure() {
-	
-	${source_dir}/configure --prefix=${prefix}
-	
-}
-
 build() {
-	
+	${source_dir}/configure --prefix=${prefix}
 	make -j${parallelism}
-
 }
 
-install() {
+package() {
 
 	make install DESTDIR="${dest_dir}"
 	mkdir -p ${dest_dir}${prefix}/share/pkgconfig/personality.d

host-recipes/xbinutils

@@ -4,14 +4,11 @@ from_source=binutils
 imagedeps="base-devel gcc"
 hostdeps="automake autoconf"
 
-configure() {
-	${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --disable-werror
-}
-
 build() {
+	${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --disable-werror
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

host-recipes/xgcc

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="automake autoconf xbinutils pkgconfig"
 deps="mlibc-headers"
 
-configure() {
-	${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --enable-languages=c,c++ -enable-threads=posix --disable-multilib
-}
-
 build() {
+	${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --enable-languages=c,c++ -enable-threads=posix --disable-multilib
 	make all-gcc all-target-libgcc -j ${parallelism}
 }
 
-install(){
+package(){
 	make DESTDIR="${dest_dir}" install-gcc install-target-libgcc
 }

jinx-config

@@ -1,2 +1,3 @@
+JINX_MAJOR_VER=0.2
 export CFLAGS="-O2 -march=x86-64 -pipe -mtune=generic"
 export CXXFLAGS="${CFLAGS}"

patches/coreutils/jinx-working-patch.patch

@@ -0,0 +1,16 @@
+diff --git coreutils-clean/src/stat.c coreutils-workdir/src/stat.c
+index 3765a8f..f6b129f 100644
+--- coreutils-clean/src/stat.c
++++ coreutils-workdir/src/stat.c
+@@ -75,11 +75,7 @@
+ #include "xvasprintf.h"
+ #include "statx.h"
+ 
+-#if HAVE_STATX && defined STATX_INO
+-# define USE_STATX 1
+-#else
+ # define USE_STATX 0
+-#endif
+ 
+ #if USE_STATVFS
+ # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER

patches/gawk/jinx-working-patch.patch

@@ -1,3 +1,54 @@
+diff --git gawk-clean/Makefile.am gawk-workdir/Makefile.am
+index 9f5e40c..3a90ed0 100644
+--- gawk-clean/Makefile.am
++++ gawk-workdir/Makefile.am
+@@ -206,18 +206,13 @@ efence: gawk
+ 	$(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
+ 
+ diffout valgrind-scan zos-diffout:
+-	@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
++	echo skip
+ 
+ valgrind:
+-	cd test; rm -f log.[0-9]*; \
+-	make check VALGRIND="valgrind --leak-check=full --log-file=log.%p"; \
+-	make valgrind-scan
++	echo skip
+ 
+ valgrind-noleak:
+-	cd test; rm -f log.[0-9]*; \
+-	make check VALGRIND="valgrind --leak-check=no --log-file=log.%p"; \
+-	make valgrind-scan
+-
++	echo skip
+ spell:
+ 	cd "$(srcdir)"/doc ; $(MAKE) spell
+ 
+diff --git gawk-clean/Makefile.in gawk-workdir/Makefile.in
+index 03f583a..69cad0f 100644
+--- gawk-clean/Makefile.in
++++ gawk-workdir/Makefile.in
+@@ -1355,17 +1355,13 @@ efence: gawk
+ 	$(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
+ 
+ diffout valgrind-scan zos-diffout:
+-	@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
++	echo skip
+ 
+ valgrind:
+-	cd test; rm -f log.[0-9]*; \
+-	make check VALGRIND="valgrind --leak-check=full --log-file=log.%p"; \
+-	make valgrind-scan
++	echo skip
+ 
+ valgrind-noleak:
+-	cd test; rm -f log.[0-9]*; \
+-	make check VALGRIND="valgrind --leak-check=no --log-file=log.%p"; \
+-	make valgrind-scan
++	echo skip
+ 
+ spell:
+ 	cd "$(srcdir)"/doc ; $(MAKE) spell
 diff --git gawk-clean/build-aux/config.sub gawk-workdir/build-aux/config.sub
 index de4259e..e9e2707 100755
 --- gawk-clean/build-aux/config.sub
@@ -11,16 +62,3 @@ index de4259e..e9e2707 100755
  	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
  	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
  	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-diff --git gawk-clean/test/Makefile.am gawk-workdir/test/Makefile.am
-index cc99dfa..155153c 100644
---- gawk-clean/test/Makefile.am
-+++ gawk-workdir/test/Makefile.am
-@@ -1670,7 +1670,7 @@ NEED_TESTOUTCMP = \
- 	beginfile2 double2 exit fmttest hsprint posix profile5 space
- 
- CMP = cmp
--AWKPROG = ../gawk$(EXEEXT)
-+AWKPROG = test
- SORT = sort
- SORT2 = LC_ALL=C sort
- 

patches/mlibc/jinx-working-patch.patch

@@ -58,6 +58,19 @@ index 3474615..e034881 100644
  }
  
  char **backtrace_symbols(void *const *, int) {
+diff --git mlibc-clean/options/linux/include/bits/linux/linux_stat.h mlibc-workdir/options/linux/include/bits/linux/linux_stat.h
+index 59009c9..170d4a1 100644
+--- mlibc-clean/options/linux/include/bits/linux/linux_stat.h
++++ mlibc-workdir/options/linux/include/bits/linux/linux_stat.h
+@@ -9,7 +9,7 @@ extern "C" {
+ 
+ #ifndef __MLIBC_ABI_ONLY
+ 
+-int statx(int, const char *, int, unsigned int, struct statx *);
++//int statx(int, const char *, int, unsigned int, struct statx *);
+ 
+ #endif /* !__MLIBC_ABI_ONLY */
+ 
 diff --git mlibc-clean/options/posix/generic/dlfcn-stubs.cpp mlibc-workdir/options/posix/generic/dlfcn-stubs.cpp
 index fc34a3b..b1a95a9 100644
 --- mlibc-clean/options/posix/generic/dlfcn-stubs.cpp
@@ -175,7 +188,7 @@ index 0000000..e5b087a
 +
 diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
 new file mode 100644
-index 0000000..903a1b4
+index 0000000..8a814ec
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
 @@ -0,0 +1,553 @@
@@ -186,8 +199,8 @@ index 0000000..903a1b4
 +#include <astral/syscall.h>
 +#include <astral/archctl.h>
 +#include <string.h>
-+#include <asm/ioctls.h>
 +#include <stdlib.h>
++#include <asm/ioctls.h>
 +#include <poll.h>
 +#include <sys/select.h>
 +

recipes/astral

@@ -4,15 +4,12 @@ from_source=astral
 imagedeps="base-devel nasm"
 hostdeps="xgcc xbinutils limine"
 
-configure() {
-	cp -pr "${source_dir}"/* .
-}
-
 build() {
+	cp -pr "${source_dir}"/* .
 	CC="x86_64-astral-gcc" LD="x86_64-astral-gcc" AS="nasm" make -j${parallelism}
 }
 
-install() {
+package() {
 	mkdir -p "${dest_dir}/boot"
 	cp astral "${dest_dir}/boot"
 }

recipes/bash

@@ -5,16 +5,13 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="readline mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --without-bash-malloc
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 	
 	mkdir -p ${dest_dir}/bin

recipes/binutils

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils automake autoconf"
 deps="mlibc"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --disable-werror
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --disable-werror
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/bzip2

@@ -5,19 +5,16 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rpf ${source_dir}/* .
 	sed -i 's@\(ln -s -f \)$(prefix)/bin/@\1@' Makefile
 	sed -i "s@(prefix)/man@(prefix)/share/man@g" Makefile
 	make -f Makefile-libbz2_so CC=x86_64-astral-gcc
 	make clean
-}
-
-build() {
 	make -j${parallelism} CC=x86_64-astral-gcc
 }
 
-install() {
+package() {
 	make install PREFIX=${dest_dir}/${prefix}
 	cp -av libbz2.so.* ${dest_dir}/${prefix}/lib
 	ln -sv libbz2.so.1.0.8 ${dest_dir}${prefix}/lib/libbz2.so

recipes/coreutils

@@ -5,15 +5,12 @@ imagedeps="base-devel gperf"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -pr ${source_dir}/* .
 	CFLAGS="-DSLOW_BUT_NO_HACKS $CFLAGS" ./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/cxxshim

@@ -4,16 +4,12 @@ revision=1
 hostdeps="xgcc xbinutils"
 imagedeps="meson ninja base-devel"
 
-
-configure() {
-        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dinstall_headers=true ${source_dir}
-}
-
 build() {
+        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dinstall_headers=true ${source_dir}
         ninja
 }
 
-install() {
+package() {
         DESTDIR=${dest_dir} ninja install
 }
 

recipes/distro-files

@@ -2,14 +2,6 @@ name=distro-files
 revision=1
 from_source=distro-files
 
-configure() {
+package() {
-	true
-}
-
-build() {
-	true
-}
-
-install() {
 	cp -r ${source_dir}/* ${dest_dir}
 }

recipes/doomgeneric

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	cp -rp ${source_dir}/doomgeneric/* .
-}
-
 build() {
+	cp -rp ${source_dir}/doomgeneric/* .
 	make
 }
 
-install() {
+package() {
 	mkdir -p ${dest_dir}/usr/bin
 	cp -f doomgeneric ${dest_dir}/usr/bin/doomgeneric
 }

recipes/e2fsprogs

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/findutils

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/frigg

@@ -4,15 +4,12 @@ revision=1
 hostdeps="xgcc xbinutils"
 imagedeps="meson ninja base-devel"
 
-configure() {
-        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dbuild_tests=disabled ${source_dir}
-}
-
 build() {
+        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dbuild_tests=disabled ${source_dir}
         ninja
 }
 
-install() {
+package() {
         DESTDIR=${dest_dir} ninja install
 }
 

recipes/gawk

@@ -5,15 +5,20 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix} --disable-nls --disable-extensions
-}
 
-build() {
+	# we need to remove the test as gawk seems to autoexecute it
+
+	echo "all:" > test/Makefile
+	echo "	echo ignore" >> test/Makefile
+	echo "install:" >> test/Makefile
+	echo "	echo ignore" >> test/Makefile
+
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/gcc

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostrundeps="automake autoconf xgcc xbinutils libstdc++-v3"
 deps="mlibc gmp mpfr mpc binutils"
 
-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() {
+	${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --enable-languages=c,c++ --with-sysroot=/ --with-build-sysroot=${sysroot_dir}
 	make -j${parallelism} all-gcc all-target-libgcc all-target-libstdc++-v3
 }
 
-install() {
+package() {
 	make install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="${dest_dir}"
 }

recipes/gmp

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/grep

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/init

@@ -5,18 +5,10 @@ imagedeps="base-devel"
 hostdeps="xbinutils xgcc"
 deps="mlibc"
 
-configure() {
-	true
-}
-
 build() {
-
 	make -C ${source_dir} -j ${parallelism}
-
 }
 
-install() {
+package() {
-
 	make -C ${source_dir} install DESTDIR=${dest_dir}
-
 }

recipes/libstb

@@ -2,15 +2,7 @@ name=libstb
 revision=1
 from_source=libstb
 
-configure() {
+package() {
-	true
-}
-
-build() {
-	true
-}
-
-install() {
 	mkdir -p ${dest_dir}/${prefix}/include/
 	cp -r ${source_dir}/*.h ${dest_dir}/${prefix}/include/
 }

recipes/limine

@@ -5,14 +5,11 @@ imagedeps="base-devel mtools nasm"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-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() {
+	"${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}"
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/linux-headers

@@ -3,14 +3,10 @@ from_source=linux
 revision=1
 imagedeps="base-devel rsync"
 
-configure() {
-	cp -r ${source_dir}/* .
-}
-
 build() {
 	true
 }
 
-install() {
+package() {
-	make headers_install ARCH=x86_64 INSTALL_HDR_PATH=${dest_dir}/${prefix}/
+	true
 }

recipes/make

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/mlibc

@@ -2,18 +2,15 @@ name=mlibc
 from_source=mlibc
 revision=1
 hostdeps="xgcc xbinutils pkgconfig"
-deps="cxxshim frigg linux-headers"
+builddeps="cxxshim frigg"
 imagedeps="meson ninja git base-devel binutils"
-
+deps="mlibc-headers"
-configure() {
-        meson --cross-file ${base_dir}/util/crossfile -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include --prefix=${prefix} ${source_dir}
-}
 
 build() {
+        meson --cross-file ${base_dir}/util/crossfile -Dmlibc_no_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include
         ninja
 }
 
-install() {
+package() {
         DESTDIR=${dest_dir} ninja install
 }
-

recipes/mlibc-headers

@@ -1,19 +1,19 @@
 name=mlibc-headers
 from_source=mlibc
 revision=1
-deps="linux-headers"
+imagedeps="ninja meson base-devel rsync"
-imagedeps="ninja meson base-devel"
+builddeps="linux-headers"
-
-configure() {
-	meson --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}" -Dlinux_kernel_headers="${sysroot}/${prefix}" -Dheaders_only=true "${source_dir}"
-}
 
 build() {
-	
+	meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}"  -Dheaders_only=true "${source_dir}" 
 	ninja
-
+	mkdir linux
+	cp -rp ${base_dir}/sources/linux/* linux
 }
 
-install() {
+package() {
+	pushd linux
+	make headers_install ARCH=x86_64 INSTALL_HDR_PATH=${dest_dir}/${prefix}/
+	popd
 	DESTDIR=${dest_dir} ninja install
 }

recipes/mount

@@ -5,14 +5,10 @@ imagedeps="base-devel"
 hostdeps="xbinutils xgcc"
 deps="mlibc"
 
-configure() {
-	true
-}
-
 build() {
 	make -C ${source_dir} -j ${parallelism}
 }
 
-install() {
+package() {
 	make -C ${source_dir} install PREFIX=${prefix} DESTDIR=${dest_dir}
 }

recipes/mpc

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc gmp mpfr"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/mpfr

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc gmp"
 
-configure() {
+build() {
 	cp -pr ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/nano

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc ncurses"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
 	make -j ${parallelism} LDFLAGS='-ltinfo'
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/nasm

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/ncurses

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils libstdc++-v3"
 deps="mlibc"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-shared --without-normal --with-termlib --enable-pc-files --enable-widec
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-shared --without-normal --with-termlib --enable-pc-files --enable-widec
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 
 	echo "INPUT(-lncursesw)" > ${dest_dir}${prefix}/lib/libncurses.so

recipes/neofetch

@@ -3,15 +3,7 @@ revision=1
 from_source=neofetch
 rundeps="bash"
 
-configure() {
+package() {
-	true
-}
-
-build() {
-	true
-}
-
-install() {
 	mkdir -p ${dest_dir}/usr/bin
 	cp -f ${source_dir}/neofetch ${dest_dir}/usr/bin/neofetch
 }

recipes/netd

@@ -5,14 +5,10 @@ imagedeps="base-devel"
 hostdeps="xbinutils xgcc"
 deps="mlibc"
 
-configure() {
-	true
-}
-
 build() {
 	make -C ${source_dir} -j ${parallelism}
 }
 
-install() {
+package() {
 	make -C ${source_dir} install PREFIX=${prefix} DESTDIR=${dest_dir}
 }

recipes/nyancat

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	cp -rp ${source_dir}/* .
-}
-
 build() {
+	cp -rp ${source_dir}/* .
 	CC=x86_64-astral-gcc make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

recipes/readline

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc ncurses"
 
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --enable-multibyte --disable-static --enable-shared
-}
-
 build() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --enable-multibyte --disable-static --enable-shared
 	make -j${parallelism} SHLIB_LIBS="-lncursesw"
 }
 
-install() {
+package() {
 	make install SHLIB_LIBS="-lncursesw" DESTDIR="${dest_dir}"
 }

recipes/sed

@@ -5,15 +5,12 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	./configure --host=x86_64-astral --prefix=${prefix}
-}
-
-build() {
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/tar

@@ -3,17 +3,14 @@ revision=1
 from_source=tar
 imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
-deps="mlibc xz bzip2 zlib"
+deps="mlibc bzip2 zlib"
-
-configure() {
-	cp -rpf ${source_dir}/* .
-	./configure --host=x86_64-astral --prefix=${prefix}
-}
 
 build() {
+	cp -rpf ${source_dir}/* .
+	./configure --host=x86_64-astral --prefix=${prefix}
 	make -j ${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 }

recipes/vim

@@ -5,7 +5,7 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="ncurses mlibc"
 
-configure() {
+build() {
 	cp -rp ${source_dir}/* .
 	vim_cv_toupper_broken="no" \
 	ac_cv_small_wchar_t="no" \
@@ -22,13 +22,10 @@ configure() {
 	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}
 }
 
-install() {
+package() {
 	make install DESTDIR=${dest_dir}
 	
 	mkdir -p ${dest_dir}/bin

recipes/xz

@@ -1,18 +0,0 @@
-name=xz
-revision=1
-from_source=xz
-imagedeps="base-devel"
-hostdeps="xgcc xbinutils"
-deps="mlibc"
-
-configure() {
-	${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static
-}
-
-build() {
-	make -j${parallelism}
-}
-
-install() {
-	make install DESTDIR="${dest_dir}"
-}

recipes/zlib

@@ -5,14 +5,11 @@ imagedeps="base-devel"
 hostdeps="xgcc xbinutils"
 deps="mlibc"
 
-configure() {
-	CHOST=x86_64-astral prefix=${prefix} ${source_dir}/configure
-}
-
 build() {
+	CHOST=x86_64-astral prefix=${prefix} ${source_dir}/configure
 	make -j${parallelism}
 }
 
-install() {
+package() {
 	make install DESTDIR="${dest_dir}"
 }

source-recipes/xz

@@ -1,10 +0,0 @@
-name=xz
-version=5.4.4
-source_method=tarball
-tarball_url="https://tukaani.org/xz/xz-${version}.tar.xz"
-tarball_sha512=2b233a924b82190ff15e970c5a4a59f1c53a0b39a96bde228c9dfc9b103b4a3e5888f5024da4834e180f6010620ff23caf9f7135a38724eb2c8d01bff7a9a9e1
-hostdeps="autoconf automake libtool pkgconfig"
-
-regenerate() {
-        autoreconf -vfi
-}

source-recipes/zlib

@@ -1,7 +1,7 @@
 name=zlib
 version=1.3
 source_method=tarball
-tarball_url="https://www.zlib.net/zlib-${version}.tar.xz"
+tarball_url="https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.xz"
 tarball_sha512=3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
 hostdeps="autoconf automake libtool pkgconfig"