From d3abf5c97df06a9aa0b6ab180c54c6a96ab267a4 Mon Sep 17 00:00:00 2001 From: Matheus Date: Tue, 9 Apr 2024 00:15:26 -0300 Subject: [PATCH] fix clean builds --- Makefile | 2 +- host-recipes/autoconf | 7 +-- host-recipes/autoconf-archive | 7 +-- host-recipes/automake | 7 +-- host-recipes/libstdc++-v3 | 7 +-- host-recipes/libtool | 9 +-- host-recipes/limine | 7 +-- host-recipes/pkgconfig | 11 +--- host-recipes/xbinutils | 7 +-- host-recipes/xgcc | 7 +-- jinx-config | 1 + patches/coreutils/jinx-working-patch.patch | 16 ++++++ patches/gawk/jinx-working-patch.patch | 64 +++++++++++++++++----- patches/mlibc/jinx-working-patch.patch | 17 +++++- recipes/astral | 7 +-- recipes/bash | 7 +-- recipes/binutils | 7 +-- recipes/bzip2 | 7 +-- recipes/coreutils | 7 +-- recipes/cxxshim | 8 +-- recipes/distro-files | 10 +--- recipes/doomgeneric | 7 +-- recipes/e2fsprogs | 7 +-- recipes/findutils | 7 +-- recipes/frigg | 7 +-- recipes/gawk | 13 +++-- recipes/gcc | 7 +-- recipes/gmp | 7 +-- recipes/grep | 7 +-- recipes/init | 10 +--- recipes/libstb | 10 +--- recipes/limine | 7 +-- recipes/linux-headers | 8 +-- recipes/make | 7 +-- recipes/mlibc | 11 ++-- recipes/mlibc-headers | 18 +++--- recipes/mount | 6 +- recipes/mpc | 7 +-- recipes/mpfr | 7 +-- recipes/nano | 7 +-- recipes/nasm | 7 +-- recipes/ncurses | 7 +-- recipes/neofetch | 10 +--- recipes/netd | 6 +- recipes/nyancat | 7 +-- recipes/readline | 7 +-- recipes/sed | 7 +-- recipes/tar | 11 ++-- recipes/vim | 7 +-- recipes/xz | 18 ------ recipes/zlib | 7 +-- source-recipes/xz | 10 ---- source-recipes/zlib | 2 +- 53 files changed, 187 insertions(+), 301 deletions(-) create mode 100644 patches/coreutils/jinx-working-patch.patch delete mode 100644 recipes/xz delete mode 100644 source-recipes/xz diff --git a/Makefile b/Makefile index 613aa16d..b5292fd1 100644 --- a/Makefile +++ b/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 diff --git a/host-recipes/autoconf b/host-recipes/autoconf index addbe571..6bd2860b 100644 --- a/host-recipes/autoconf +++ b/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}" } diff --git a/host-recipes/autoconf-archive b/host-recipes/autoconf-archive index 16878487..e35c5b03 100644 --- a/host-recipes/autoconf-archive +++ b/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}" } diff --git a/host-recipes/automake b/host-recipes/automake index 1025398f..e774e246 100644 --- a/host-recipes/automake +++ b/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 } diff --git a/host-recipes/libstdc++-v3 b/host-recipes/libstdc++-v3 index 81580e40..a48805aa 100644 --- a/host-recipes/libstdc++-v3 +++ b/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/ } diff --git a/host-recipes/libtool b/host-recipes/libtool index 376d65b2..31568521 100644 --- a/host-recipes/libtool +++ b/host-recipes/libtool @@ -4,19 +4,14 @@ from_source=libtool hostdeps="autoconf automake" imagedeps="gcc help2man" - -configure() { +build() { cp -pr ${source_dir}/* . ./configure --prefix=${prefix} -} - -build() { - make -j${parallelism} } -install() { +package() { make install DESTDIR="${dest_dir}" diff --git a/host-recipes/limine b/host-recipes/limine index 9694f0dc..98ba2db8 100644 --- a/host-recipes/limine +++ b/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} } diff --git a/host-recipes/pkgconfig b/host-recipes/pkgconfig index bb613462..01e0f4f9 100644 --- a/host-recipes/pkgconfig +++ b/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 diff --git a/host-recipes/xbinutils b/host-recipes/xbinutils index a36a1495..6f8bd338 100644 --- a/host-recipes/xbinutils +++ b/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}" } diff --git a/host-recipes/xgcc b/host-recipes/xgcc index 0009c689..0b4a097a 100644 --- a/host-recipes/xgcc +++ b/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 } diff --git a/jinx-config b/jinx-config index fa827f14..896016b5 100644 --- a/jinx-config +++ b/jinx-config @@ -1,2 +1,3 @@ +JINX_MAJOR_VER=0.2 export CFLAGS="-O2 -march=x86-64 -pipe -mtune=generic" export CXXFLAGS="${CFLAGS}" diff --git a/patches/coreutils/jinx-working-patch.patch b/patches/coreutils/jinx-working-patch.patch new file mode 100644 index 00000000..1f3389de --- /dev/null +++ b/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 diff --git a/patches/gawk/jinx-working-patch.patch b/patches/gawk/jinx-working-patch.patch index c7abc753..a3dce070 100644 --- a/patches/gawk/jinx-working-patch.patch +++ b/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 - diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch index 1cbac600..8cd10bd0 100644 --- a/patches/mlibc/jinx-working-patch.patch +++ b/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 +#include +#include -+#include +#include ++#include +#include +#include + diff --git a/recipes/astral b/recipes/astral index 0b6dd94b..49c0da7d 100644 --- a/recipes/astral +++ b/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" } diff --git a/recipes/bash b/recipes/bash index 419d327b..86d3b748 100644 --- a/recipes/bash +++ b/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 diff --git a/recipes/binutils b/recipes/binutils index cbcede0c..29711abb 100644 --- a/recipes/binutils +++ b/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}" } diff --git a/recipes/bzip2 b/recipes/bzip2 index 4f47c3f8..2dcfec07 100644 --- a/recipes/bzip2 +++ b/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 diff --git a/recipes/coreutils b/recipes/coreutils index caee82ed..b3d3afa6 100644 --- a/recipes/coreutils +++ b/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} } diff --git a/recipes/cxxshim b/recipes/cxxshim index fd1b315d..06347ef0 100644 --- a/recipes/cxxshim +++ b/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 } diff --git a/recipes/distro-files b/recipes/distro-files index e93e339e..e2d10eed 100644 --- a/recipes/distro-files +++ b/recipes/distro-files @@ -2,14 +2,6 @@ name=distro-files revision=1 from_source=distro-files -configure() { - true -} - -build() { - true -} - -install() { +package() { cp -r ${source_dir}/* ${dest_dir} } diff --git a/recipes/doomgeneric b/recipes/doomgeneric index dd095cdf..7bfbd30f 100644 --- a/recipes/doomgeneric +++ b/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 } diff --git a/recipes/e2fsprogs b/recipes/e2fsprogs index 57490dbc..26d7862b 100644 --- a/recipes/e2fsprogs +++ b/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} } diff --git a/recipes/findutils b/recipes/findutils index f6a451a2..43dc924a 100644 --- a/recipes/findutils +++ b/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} } diff --git a/recipes/frigg b/recipes/frigg index 1e84cc89..10c551d7 100644 --- a/recipes/frigg +++ b/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 } diff --git a/recipes/gawk b/recipes/gawk index 64c76062..8dd4c4a5 100644 --- a/recipes/gawk +++ b/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} } diff --git a/recipes/gcc b/recipes/gcc index 1bb55573..b6eacf66 100644 --- a/recipes/gcc +++ b/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}" } diff --git a/recipes/gmp b/recipes/gmp index 81cd5c25..31cd8deb 100644 --- a/recipes/gmp +++ b/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}" } diff --git a/recipes/grep b/recipes/grep index 5d7d230e..e37cc7cd 100644 --- a/recipes/grep +++ b/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} } diff --git a/recipes/init b/recipes/init index d154fffe..e2542d8e 100644 --- a/recipes/init +++ b/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} - } diff --git a/recipes/libstb b/recipes/libstb index 96b150ec..a1538541 100644 --- a/recipes/libstb +++ b/recipes/libstb @@ -2,15 +2,7 @@ name=libstb revision=1 from_source=libstb -configure() { - true -} - -build() { - true -} - -install() { +package() { mkdir -p ${dest_dir}/${prefix}/include/ cp -r ${source_dir}/*.h ${dest_dir}/${prefix}/include/ } diff --git a/recipes/limine b/recipes/limine index c87d766f..893dcf17 100644 --- a/recipes/limine +++ b/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} } diff --git a/recipes/linux-headers b/recipes/linux-headers index 3313d040..8d9da1d2 100644 --- a/recipes/linux-headers +++ b/recipes/linux-headers @@ -3,14 +3,10 @@ from_source=linux revision=1 imagedeps="base-devel rsync" -configure() { - cp -r ${source_dir}/* . -} - build() { true } -install() { - make headers_install ARCH=x86_64 INSTALL_HDR_PATH=${dest_dir}/${prefix}/ +package() { + true } diff --git a/recipes/make b/recipes/make index e2488638..e08d95e4 100644 --- a/recipes/make +++ b/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} } diff --git a/recipes/mlibc b/recipes/mlibc index d22e4a5d..14e784fe 100644 --- a/recipes/mlibc +++ b/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" - -configure() { - meson --cross-file ${base_dir}/util/crossfile -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include --prefix=${prefix} ${source_dir} -} +deps="mlibc-headers" 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 } - diff --git a/recipes/mlibc-headers b/recipes/mlibc-headers index 50fd0154..846b5418 100644 --- a/recipes/mlibc-headers +++ b/recipes/mlibc-headers @@ -1,19 +1,19 @@ name=mlibc-headers from_source=mlibc revision=1 -deps="linux-headers" -imagedeps="ninja meson base-devel" - -configure() { - meson --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}" -Dlinux_kernel_headers="${sysroot}/${prefix}" -Dheaders_only=true "${source_dir}" -} +imagedeps="ninja meson base-devel rsync" +builddeps="linux-headers" 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 } diff --git a/recipes/mount b/recipes/mount index 34a5aadf..49f3511f 100644 --- a/recipes/mount +++ b/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} } diff --git a/recipes/mpc b/recipes/mpc index 0fd0f9a6..54303ab4 100644 --- a/recipes/mpc +++ b/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}" } diff --git a/recipes/mpfr b/recipes/mpfr index 0b8349a9..e1f6273c 100644 --- a/recipes/mpfr +++ b/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}" } diff --git a/recipes/nano b/recipes/nano index d4d72961..a9692a6d 100644 --- a/recipes/nano +++ b/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} } diff --git a/recipes/nasm b/recipes/nasm index 30b45e72..27006e4f 100644 --- a/recipes/nasm +++ b/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}" } diff --git a/recipes/ncurses b/recipes/ncurses index 9ba9b406..c1c41dc1 100644 --- a/recipes/ncurses +++ b/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 diff --git a/recipes/neofetch b/recipes/neofetch index ee05e7bb..64fe7ddf 100644 --- a/recipes/neofetch +++ b/recipes/neofetch @@ -3,15 +3,7 @@ revision=1 from_source=neofetch rundeps="bash" -configure() { - true -} - -build() { - true -} - -install() { +package() { mkdir -p ${dest_dir}/usr/bin cp -f ${source_dir}/neofetch ${dest_dir}/usr/bin/neofetch } diff --git a/recipes/netd b/recipes/netd index fa29a441..9b57e1aa 100644 --- a/recipes/netd +++ b/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} } diff --git a/recipes/nyancat b/recipes/nyancat index 8784a3b5..1461a475 100644 --- a/recipes/nyancat +++ b/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}" } diff --git a/recipes/readline b/recipes/readline index edd2f241..933af1ba 100644 --- a/recipes/readline +++ b/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}" } diff --git a/recipes/sed b/recipes/sed index 117f2aea..44a6c8f8 100644 --- a/recipes/sed +++ b/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} } diff --git a/recipes/tar b/recipes/tar index 94070add..19c3cd6d 100644 --- a/recipes/tar +++ b/recipes/tar @@ -3,17 +3,14 @@ revision=1 from_source=tar imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc xz bzip2 zlib" - -configure() { - cp -rpf ${source_dir}/* . - ./configure --host=x86_64-astral --prefix=${prefix} -} +deps="mlibc bzip2 zlib" build() { + cp -rpf ${source_dir}/* . + ./configure --host=x86_64-astral --prefix=${prefix} make -j ${parallelism} } -install() { +package() { make install DESTDIR=${dest_dir} } diff --git a/recipes/vim b/recipes/vim index cb7cb912..946695cd 100644 --- a/recipes/vim +++ b/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 diff --git a/recipes/xz b/recipes/xz deleted file mode 100644 index 04513fbf..00000000 --- a/recipes/xz +++ /dev/null @@ -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}" -} diff --git a/recipes/zlib b/recipes/zlib index 3165f562..e18742b5 100644 --- a/recipes/zlib +++ b/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}" } diff --git a/source-recipes/xz b/source-recipes/xz deleted file mode 100644 index 631c5ee4..00000000 --- a/source-recipes/xz +++ /dev/null @@ -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 -} diff --git a/source-recipes/zlib b/source-recipes/zlib index e2bcc809..368563bd 100644 --- a/source-recipes/zlib +++ b/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"