From 817f44275b4d0ec35f647a0934ecef7285225532 Mon Sep 17 00:00:00 2001 From: Matheus Date: Thu, 12 Dec 2024 09:17:46 -0300 Subject: [PATCH] jinx: upgrade and fix build --- Makefile | 18 ++++++++---------- host-recipes/autoconf | 5 ++++- host-recipes/autoconf-archive | 5 ++++- host-recipes/automake | 5 ++++- host-recipes/cmake | 7 +++++-- host-recipes/fontutil | 6 ++++-- host-recipes/libstdc++-v3 | 2 +- host-recipes/libtool | 12 ++++++------ host-recipes/limine | 8 +++++--- host-recipes/pkgconfig | 10 +++++----- host-recipes/python | 7 +++++-- host-recipes/util-macros | 6 +++++- host-recipes/xbinutils | 7 +++++-- host-recipes/xgcc | 7 +++++-- host-recipes/xorgproto | 7 +++++-- host-recipes/xtrans | 7 +++++-- jinx-config | 2 +- recipes/ace-of-penguins | 7 +++++-- recipes/astral | 2 +- recipes/bash | 7 +++++-- recipes/binutils | 7 +++++-- recipes/bzip2 | 2 +- recipes/coreutils | 7 +++++-- recipes/curl | 7 +++++-- recipes/diffutils | 7 +++++-- recipes/doomgeneric | 2 +- recipes/doomgeneric-x11 | 2 +- recipes/e2fsprogs | 7 +++++-- recipes/file | 7 +++++-- recipes/findutils | 7 +++++-- recipes/fontconfig | 7 +++++-- recipes/fontutil | 5 ++++- recipes/freetype | 7 +++++-- recipes/frigg | 7 +++++-- recipes/fvwm | 10 ++++++---- recipes/gawk | 6 ++++-- recipes/gcc | 7 +++++-- recipes/gettext | 7 +++++-- recipes/git | 7 +++++-- recipes/glib | 7 +++++-- recipes/glu | 6 ++++-- recipes/gmp | 7 +++++-- recipes/grep | 7 +++++-- recipes/gzip | 7 +++++-- recipes/imlib2 | 7 +++++-- recipes/init | 2 +- recipes/less | 7 +++++-- recipes/libXau | 5 ++++- recipes/libXdmcp | 5 ++++- recipes/libevent | 9 ++++++--- recipes/libexpat | 7 +++++-- recipes/libffi | 7 +++++-- recipes/libfontenc | 5 ++++- recipes/libgcrypt | 7 +++++-- recipes/libgpg-error | 7 +++++-- recipes/libice | 6 ++++-- recipes/libiconv | 7 +++++-- recipes/libintl | 7 +++++-- recipes/libjpeg-turbo | 6 ++++-- recipes/libpng | 7 +++++-- recipes/libsm | 7 +++++-- recipes/libx11 | 7 +++++-- recipes/libxaw | 7 +++++-- recipes/libxcb | 7 +++++-- recipes/libxcrypt | 7 +++++-- recipes/libxcursor | 5 ++++- recipes/libxcvt | 7 +++++-- recipes/libxdamage | 7 +++++-- recipes/libxext | 7 +++++-- recipes/libxfixes | 7 +++++-- recipes/libxfont2 | 7 +++++-- recipes/libxft | 2 +- recipes/libxi | 7 +++++-- recipes/libxinerama | 5 ++++- recipes/libxml | 7 +++++-- recipes/libxmu | 7 +++++-- recipes/libxpm | 7 +++++-- recipes/libxrandr | 5 ++++- recipes/libxrender | 7 +++++-- recipes/libxt | 7 +++++-- recipes/libxxf86vm | 7 +++++-- recipes/limine | 7 +++++-- recipes/links | 7 +++++-- recipes/linux-headers | 2 +- recipes/llvm | 6 ++++-- recipes/make | 7 +++++-- recipes/mesa | 8 ++++++-- recipes/mesa-demos | 6 ++++-- recipes/mkfontscale | 5 ++++- recipes/mlibc | 7 +++++-- recipes/mlibc-headers | 7 +++++-- recipes/mount | 2 +- recipes/mpc | 7 +++++-- recipes/mpfr | 7 +++++-- recipes/nano | 7 +++++-- recipes/nasm | 7 +++++-- recipes/ncurses | 7 +++++-- recipes/netd | 2 +- recipes/nyancat | 2 +- recipes/openssh | 5 ++++- recipes/openssl | 5 ++++- recipes/oss | 7 +++++-- recipes/pcre2 | 5 ++++- recipes/pixman | 7 +++++-- recipes/python | 7 +++++-- recipes/qemu | 7 +++++-- recipes/readline | 7 +++++-- recipes/sdl2 | 6 ++++-- recipes/sed | 7 +++++-- recipes/shadow | 7 +++++-- recipes/sudo | 7 +++++-- recipes/tar | 7 +++++-- recipes/twm | 7 +++++-- recipes/tyrquake | 7 +++++-- recipes/util-macros | 7 +++++-- recipes/vim | 7 +++++-- recipes/wget | 7 +++++-- recipes/xauth | 7 +++++-- recipes/xbitmaps | 2 +- recipes/xcb-proto | 7 +++++-- recipes/xclock | 7 +++++-- recipes/xedit | 5 ++++- recipes/xev | 5 ++++- recipes/xeyes | 7 +++++-- recipes/xf86-input-keyboard | 5 ++++- recipes/xf86-input-mouse | 5 ++++- recipes/xf86-video-fbdev | 5 ++++- recipes/xfishtank | 2 +- recipes/xfontalias | 7 +++++-- recipes/xfontmiscethipic | 7 +++++-- recipes/xfontmiscmisc | 7 +++++-- recipes/xkbcomp | 5 ++++- recipes/xkbfile | 7 +++++-- recipes/xkeyboardconfig | 7 +++++-- recipes/xneko | 2 +- recipes/xorg-server | 7 +++++-- recipes/xorgproto | 7 +++++-- recipes/xrandr | 5 ++++- recipes/xscreensaver | 7 +++++-- recipes/xsetroot | 7 +++++-- recipes/xterm | 7 +++++-- recipes/xtrans | 7 +++++-- recipes/zlib | 7 +++++-- source-recipes/ace-of-penguins | 2 +- source-recipes/astral | 2 +- source-recipes/autoconf | 2 +- source-recipes/autoconf-archive | 2 +- source-recipes/automake | 2 +- source-recipes/bash | 2 +- source-recipes/binutils | 2 +- source-recipes/bzip2 | 2 +- source-recipes/cmake | 2 +- source-recipes/coreutils | 2 +- source-recipes/curl | 2 +- source-recipes/diffutils | 2 +- source-recipes/distro-files | 2 +- source-recipes/doomgeneric | 2 +- source-recipes/e2fsprogs | 2 +- source-recipes/file | 2 +- source-recipes/findutils | 2 +- source-recipes/fontconfig | 2 +- source-recipes/fontutil | 2 +- source-recipes/freestnd-c-hdrs | 2 +- source-recipes/freestnd-cxx-hdrs | 2 +- source-recipes/freetype | 2 +- source-recipes/frigg | 2 +- source-recipes/fvwm | 2 +- source-recipes/gawk | 2 +- source-recipes/gcc | 2 +- source-recipes/gettext | 2 +- source-recipes/git | 2 +- source-recipes/glib | 2 +- source-recipes/glu | 2 +- source-recipes/gmp | 2 +- source-recipes/grep | 2 +- source-recipes/gzip | 2 +- source-recipes/imlib2 | 2 +- source-recipes/init | 2 +- source-recipes/less | 2 +- source-recipes/libXau | 2 +- source-recipes/libXdmcp | 2 +- source-recipes/libevent | 2 +- source-recipes/libexpat | 2 +- source-recipes/libffi | 2 +- source-recipes/libfontenc | 4 ++-- source-recipes/libgcrypt | 2 +- source-recipes/libgpg-error | 2 +- source-recipes/libice | 2 +- source-recipes/libiconv | 2 +- source-recipes/libjpeg-turbo | 2 +- source-recipes/libpng | 2 +- source-recipes/libsm | 2 +- source-recipes/libstb | 2 +- source-recipes/libtool | 4 ++-- source-recipes/libx11 | 2 +- source-recipes/libxaw | 2 +- source-recipes/libxcb | 2 +- source-recipes/libxcrypt | 2 +- source-recipes/libxcursor | 2 +- source-recipes/libxcvt | 2 +- source-recipes/libxdamage | 2 +- source-recipes/libxext | 2 +- source-recipes/libxfixes | 2 +- source-recipes/libxfont2 | 2 +- source-recipes/libxft | 2 +- source-recipes/libxi | 2 +- source-recipes/libxinerama | 2 +- source-recipes/libxml | 2 +- source-recipes/libxmu | 2 +- source-recipes/libxpm | 2 +- source-recipes/libxrandr | 2 +- source-recipes/libxrender | 2 +- source-recipes/libxt | 2 +- source-recipes/libxxf86vm | 2 +- source-recipes/limine | 2 +- source-recipes/links | 2 +- source-recipes/linux | 2 +- source-recipes/llvm | 2 +- source-recipes/make | 2 +- source-recipes/make-ca | 2 +- source-recipes/mesa | 2 +- source-recipes/mesa-demos | 2 +- source-recipes/mkfontscale | 2 +- source-recipes/mlibc | 2 +- source-recipes/mount | 2 +- source-recipes/mpc | 2 +- source-recipes/mpfr | 2 +- source-recipes/nano | 2 +- source-recipes/nasm | 2 +- source-recipes/ncurses | 2 +- source-recipes/neofetch | 2 +- source-recipes/netd | 2 +- source-recipes/nyancat | 2 +- source-recipes/openssh | 2 +- source-recipes/openssl | 2 +- source-recipes/oss | 2 +- source-recipes/pcre2 | 2 +- source-recipes/pixman | 2 +- source-recipes/pkgconfig | 4 ++-- source-recipes/python | 2 +- source-recipes/qemu | 2 +- source-recipes/readline | 2 +- source-recipes/sdl2 | 2 +- source-recipes/sed | 2 +- source-recipes/shadow | 2 +- source-recipes/sudo | 2 +- source-recipes/tar | 2 +- source-recipes/twm | 2 +- source-recipes/tyrquake | 2 +- source-recipes/util-macros | 2 +- source-recipes/vim | 2 +- source-recipes/wget | 2 +- source-recipes/xauth | 2 +- source-recipes/xbitmaps | 2 +- source-recipes/xcb-proto | 2 +- source-recipes/xclock | 2 +- source-recipes/xedit | 2 +- source-recipes/xev | 2 +- source-recipes/xeyes | 2 +- source-recipes/xf86-input-keyboard | 2 +- source-recipes/xf86-input-mouse | 2 +- source-recipes/xf86-video-fbdev | 2 +- source-recipes/xfishtank | 2 +- source-recipes/xfontalias | 2 +- source-recipes/xfontmiscethipic | 2 +- source-recipes/xfontmiscmisc | 2 +- source-recipes/xkbcomp | 2 +- source-recipes/xkbfile | 2 +- source-recipes/xkeyboardconfig | 2 +- source-recipes/xneko | 2 +- source-recipes/xorg-server | 2 +- source-recipes/xorgproto | 2 +- source-recipes/xrandr | 2 +- source-recipes/xscreensaver | 2 +- source-recipes/xsetroot | 2 +- source-recipes/xterm | 2 +- source-recipes/xtrans | 2 +- source-recipes/zlib | 2 +- 278 files changed, 771 insertions(+), 406 deletions(-) diff --git a/Makefile b/Makefile index 469f080d..e9e9ac4f 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ all: jinx git submodule update --init --recursive mkdir -p $(ISODIR) make kernel - make build-$(DISTROTYPE) make $(ISO) @echo @echo "|--------------------------------------------------------------|" @@ -31,7 +30,7 @@ all: jinx @echo jinx: - curl https://raw.githubusercontent.com/mintsuki/jinx/99d8151ca5f849e48c38cbe1a232c6a7a1dbc681/jinx > jinx + curl https://raw.githubusercontent.com/mintsuki/jinx/f459adb138abff6afc7936f5fd4bc9e24023a495/jinx > jinx chmod +x jinx iso: $(ISO) @@ -53,12 +52,6 @@ $(IMG): limine.conf liminebg.bmp $(KERNEL) $(INITRD)-$(DISTROTYPE) # ------ build targets ------ -build-full: - ./jinx build-all - -build-minimal: - ./jinx build $(MINIMALPACKAGES) - kernel: rm -f builds/astral.packaged rm -f builds/astral.built @@ -67,7 +60,7 @@ kernel: # ------ initrd targets ------ $(INITRD)-full: - ./jinx sysroot + ./jinx install sysroot \* mkdir -p initrds ./geninitrd.sh sysroot $(INITRD)-full @@ -101,8 +94,13 @@ clean-kernel: clean: make -i clean-kernel - ./jinx clean rm jinx + rm -rf builds + rm -rf host-builds + rm -rf pkgs + rm -rf host-pkgs + rm -rf sources + rm -rf sysroot rm -rf $(ISODIR) rm -f $(ISO) rm -f $(DISKNAME) diff --git a/host-recipes/autoconf b/host-recipes/autoconf index 6bd2860b..2d4350c2 100644 --- a/host-recipes/autoconf +++ b/host-recipes/autoconf @@ -3,8 +3,11 @@ revision=1 from_source=autoconf imagedeps="gcc" +configure() { + ${source_dir}/configure --prefix=${prefix} +} + build() { - ${source_dir}/configure --prefix="${prefix}" make -j${parallelism} } diff --git a/host-recipes/autoconf-archive b/host-recipes/autoconf-archive index e35c5b03..eff43674 100644 --- a/host-recipes/autoconf-archive +++ b/host-recipes/autoconf-archive @@ -3,8 +3,11 @@ revision=1 from_source=autoconf-archive imagedeps="gcc" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} +} + +build() { make -j${parallelism} } diff --git a/host-recipes/automake b/host-recipes/automake index e774e246..71ec4aea 100644 --- a/host-recipes/automake +++ b/host-recipes/automake @@ -4,8 +4,11 @@ from_source=automake imagedeps="gcc" hostdeps="autoconf" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} +} + +build() { make -j${parallelism} } diff --git a/host-recipes/cmake b/host-recipes/cmake index 06c95a4c..0bfc047e 100644 --- a/host-recipes/cmake +++ b/host-recipes/cmake @@ -1,10 +1,13 @@ name=cmake revision=1 from_source=cmake -imagedeps="gcc" +imagedeps="gcc build-essential libssl-dev" + +configure() { + ${source_dir}/configure --prefix=${prefix} --parallel=${parallelism} +} build() { - ${source_dir}/configure --prefix=${prefix} --parallel=${parallelism} make -j${parallelism} } diff --git a/host-recipes/fontutil b/host-recipes/fontutil index ee43f259..35cd173a 100644 --- a/host-recipes/fontutil +++ b/host-recipes/fontutil @@ -1,12 +1,14 @@ name=fontutil revision=1 from_source=fontutil -imagedeps="gcc" +imagedeps="gcc build-essential" hostdeps="xgcc xbinutils pkgconfig util-macros xorgproto" +configure() { + ${source_dir}/configure --prefix=${prefix} +} build() { - ${source_dir}/configure --prefix=${prefix} make -j${parallelism} } diff --git a/host-recipes/libstdc++-v3 b/host-recipes/libstdc++-v3 index a48805aa..686b25ac 100644 --- a/host-recipes/libstdc++-v3 +++ b/host-recipes/libstdc++-v3 @@ -1,7 +1,7 @@ name=libstdc++-v3 revision=1 from_source=gcc -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="automake autoconf xbinutils xgcc" deps="mlibc" diff --git a/host-recipes/libtool b/host-recipes/libtool index 31568521..c6628b18 100644 --- a/host-recipes/libtool +++ b/host-recipes/libtool @@ -2,18 +2,18 @@ name=libtool revision=1 from_source=libtool hostdeps="autoconf automake" -imagedeps="gcc help2man" +imagedeps="gcc build-essential help2man" + +configure() { + cp -pr ${source_dir}/* . + ./configure --prefix=${prefix} +} build() { - cp -pr ${source_dir}/* . - ./configure --prefix=${prefix} make -j${parallelism} - } package() { - make install DESTDIR="${dest_dir}" - } diff --git a/host-recipes/limine b/host-recipes/limine index 98ba2db8..20b1e87e 100644 --- a/host-recipes/limine +++ b/host-recipes/limine @@ -1,11 +1,13 @@ name=limine from_source=limine revision=1 -imagedeps="base-devel mtools nasm" +imagedeps="build-essential mtools nasm" + +configure() { + "${source_dir}/configure" --enable-bios-cd --enable-bios-pxe --enable-bios --enable-uefi-ia32 --enable-uefi-x86-64 --enable-uefi-cd --prefix="${prefix}" +} 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}" make -j${parallelism} } diff --git a/host-recipes/pkgconfig b/host-recipes/pkgconfig index 01e0f4f9..b4cf53f0 100644 --- a/host-recipes/pkgconfig +++ b/host-recipes/pkgconfig @@ -1,16 +1,17 @@ name=pkgconfig revision=1 from_source=pkgconfig -imagedeps="gcc base-devel" +imagedeps="gcc build-essential automake autoconf libtool" +configure() { + ${source_dir}/configure --prefix=${prefix} +} build() { - ${source_dir}/configure --prefix=${prefix} make -j${parallelism} } package() { - make install DESTDIR="${dest_dir}" mkdir -p ${dest_dir}${prefix}/share/pkgconfig/personality.d @@ -23,6 +24,5 @@ SystemLibraryPaths: ${sysroot_dir}/usr/lib EOF ln -s pkgconf ${dest_dir}${prefix}/bin/x86_64-astral-pkg-config - + ln -s pkgconf ${dest_dir}${prefix}/bin/pkg-config } - diff --git a/host-recipes/python b/host-recipes/python index 76df90ca..5c99cce9 100644 --- a/host-recipes/python +++ b/host-recipes/python @@ -1,10 +1,13 @@ name=python from_source=python revision=1 -imagedeps="base-devel" +imagedeps="build-essential" + +configure() { + "${source_dir}/configure" --prefix=${prefix} +} build() { - "${source_dir}/configure" --prefix=${prefix} make -j${parallelism} } diff --git a/host-recipes/util-macros b/host-recipes/util-macros index 60e2c0c2..6ddd0705 100644 --- a/host-recipes/util-macros +++ b/host-recipes/util-macros @@ -1,10 +1,14 @@ name=util-macros revision=1 from_source=util-macros -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base" +configure() { + ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} +} + build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/host-recipes/xbinutils b/host-recipes/xbinutils index 6f8bd338..01b645d2 100644 --- a/host-recipes/xbinutils +++ b/host-recipes/xbinutils @@ -1,11 +1,14 @@ name=xbinutils revision=1 from_source=binutils -imagedeps="base-devel gcc" +imagedeps="build-essential gcc" hostdeps="automake autoconf" -build() { +configure() { ${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --disable-werror +} + +build() { make -j${parallelism} } diff --git a/host-recipes/xgcc b/host-recipes/xgcc index 98de5d8b..044c26b8 100644 --- a/host-recipes/xgcc +++ b/host-recipes/xgcc @@ -1,12 +1,15 @@ name=xgcc revision=1 from_source=gcc -imagedeps="base-devel" +imagedeps="build-essential libmpfr-dev libmpc-dev libgmp-dev" hostdeps="automake autoconf xbinutils pkgconfig" deps="mlibc-headers" -build() { +configure() { ${source_dir}/configure --target=x86_64-astral --prefix=${prefix} --with-sysroot=${sysroot_dir} --enable-languages=c,c++ -enable-threads=posix --disable-multilib --enable-shared --enable-host-shared --with-pic +} + +build() { make all-gcc all-target-libgcc -j ${parallelism} } diff --git a/host-recipes/xorgproto b/host-recipes/xorgproto index a680f721..e090e5aa 100644 --- a/host-recipes/xorgproto +++ b/host-recipes/xorgproto @@ -1,11 +1,14 @@ name=xorgproto revision=1 from_source=xorgproto -imagedeps="meson ninja gcc" +imagedeps="meson ninja-build gcc build-essential" hostdeps="xgcc xbinutils pkgconfig" -build() { +configure() { meson --prefix=${prefix} -Dlegacy=true ${source_dir} +} + +build() { ninja } diff --git a/host-recipes/xtrans b/host-recipes/xtrans index 46137a22..19b7e62e 100644 --- a/host-recipes/xtrans +++ b/host-recipes/xtrans @@ -1,12 +1,15 @@ name=xtrans revision=1 from_source=xtrans -imagedeps="meson ninja gcc" +imagedeps="meson ninja-build gcc build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} +} + +build() { make -j${parallelism} } diff --git a/jinx-config b/jinx-config index 896016b5..67305bcf 100644 --- a/jinx-config +++ b/jinx-config @@ -1,3 +1,3 @@ -JINX_MAJOR_VER=0.2 +JINX_MAJOR_VER=0.4 export CFLAGS="-O2 -march=x86-64 -pipe -mtune=generic" export CXXFLAGS="${CFLAGS}" diff --git a/recipes/ace-of-penguins b/recipes/ace-of-penguins index 383e23c9..c59d01dc 100644 --- a/recipes/ace-of-penguins +++ b/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} } diff --git a/recipes/astral b/recipes/astral index 49c0da7d..cbe53061 100644 --- a/recipes/astral +++ b/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() { diff --git a/recipes/bash b/recipes/bash index 3e7fe85e..4462e4dc 100644 --- a/recipes/bash +++ b/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} } diff --git a/recipes/binutils b/recipes/binutils index d157073a..cfe2ff7f 100644 --- a/recipes/binutils +++ b/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 } diff --git a/recipes/bzip2 b/recipes/bzip2 index 8e4648af..8cc8b68a 100644 --- a/recipes/bzip2 +++ b/recipes/bzip2 @@ -1,7 +1,7 @@ name=bzip2 revision=1 from_source=bzip2 -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils" deps="base" diff --git a/recipes/coreutils b/recipes/coreutils index b8accff5..601eb0a5 100644 --- a/recipes/coreutils +++ b/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} } diff --git a/recipes/curl b/recipes/curl index 5079ac8b..3422baf2 100644 --- a/recipes/curl +++ b/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} } diff --git a/recipes/diffutils b/recipes/diffutils index e64bed40..5d33c6fc 100644 --- a/recipes/diffutils +++ b/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} } diff --git a/recipes/doomgeneric b/recipes/doomgeneric index dc7f7e4c..92c253d1 100644 --- a/recipes/doomgeneric +++ b/recipes/doomgeneric @@ -1,7 +1,7 @@ name=doomgeneric revision=1 from_source=doomgeneric -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils" deps="base" diff --git a/recipes/doomgeneric-x11 b/recipes/doomgeneric-x11 index fecd1b7a..2ff2259d 100644 --- a/recipes/doomgeneric-x11 +++ b/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" diff --git a/recipes/e2fsprogs b/recipes/e2fsprogs index 7a75df54..7451fef6 100644 --- a/recipes/e2fsprogs +++ b/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} } diff --git a/recipes/file b/recipes/file index e28f9efb..3470a3f7 100644 --- a/recipes/file +++ b/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} } diff --git a/recipes/findutils b/recipes/findutils index 416a4d7b..5e4744dc 100644 --- a/recipes/findutils +++ b/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} } diff --git a/recipes/fontconfig b/recipes/fontconfig index e9804674..98255688 100644 --- a/recipes/fontconfig +++ b/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} } diff --git a/recipes/fontutil b/recipes/fontutil index b72f4dd4..ac29cc00 100644 --- a/recipes/fontutil +++ b/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} } diff --git a/recipes/freetype b/recipes/freetype index 033049c6..85674ce7 100644 --- a/recipes/freetype +++ b/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} } diff --git a/recipes/frigg b/recipes/frigg index 657cc622..fb4e29e6 100644 --- a/recipes/frigg +++ b/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 } diff --git a/recipes/fvwm b/recipes/fvwm index edfcf87a..e5559d99 100644 --- a/recipes/fvwm +++ b/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() { diff --git a/recipes/gawk b/recipes/gawk index ffec69aa..e60bba04 100644 --- a/recipes/gawk +++ b/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} } diff --git a/recipes/gcc b/recipes/gcc index b9b7af25..79393cd2 100644 --- a/recipes/gcc +++ b/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 } diff --git a/recipes/gettext b/recipes/gettext index 940d46d8..fcfabf36 100644 --- a/recipes/gettext +++ b/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} } diff --git a/recipes/git b/recipes/git index f1152c46..dc773656 100644 --- a/recipes/git +++ b/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} } diff --git a/recipes/glib b/recipes/glib index f73461f2..a530eeff 100644 --- a/recipes/glib +++ b/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} } diff --git a/recipes/glu b/recipes/glu index 5a69f126..b5b9e66a 100644 --- a/recipes/glu +++ b/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} } diff --git a/recipes/gmp b/recipes/gmp index a36bb41b..7696dc89 100644 --- a/recipes/gmp +++ b/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} } diff --git a/recipes/grep b/recipes/grep index 0648ffb1..94f4bc24 100644 --- a/recipes/grep +++ b/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} } diff --git a/recipes/gzip b/recipes/gzip index 1a42621f..deaad8d6 100644 --- a/recipes/gzip +++ b/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} } diff --git a/recipes/imlib2 b/recipes/imlib2 index a845877d..dcb9877d 100644 --- a/recipes/imlib2 +++ b/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} } diff --git a/recipes/init b/recipes/init index 8ebc7b2b..383e50bc 100644 --- a/recipes/init +++ b/recipes/init @@ -1,7 +1,7 @@ name=init revision=1 from_source=init -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xbinutils xgcc" deps="base" diff --git a/recipes/less b/recipes/less index c41a161a..7873e120 100644 --- a/recipes/less +++ b/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' } diff --git a/recipes/libXau b/recipes/libXau index 16efa297..92738a45 100644 --- a/recipes/libXau +++ b/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} } diff --git a/recipes/libXdmcp b/recipes/libXdmcp index 095ada0e..758e54fd 100644 --- a/recipes/libXdmcp +++ b/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} } diff --git a/recipes/libevent b/recipes/libevent index 5475504a..57939fd2 100644 --- a/recipes/libevent +++ b/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} } diff --git a/recipes/libexpat b/recipes/libexpat index ec59fb58..f8701a1b 100644 --- a/recipes/libexpat +++ b/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} } diff --git a/recipes/libffi b/recipes/libffi index 7276f59d..09da0151 100644 --- a/recipes/libffi +++ b/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} } diff --git a/recipes/libfontenc b/recipes/libfontenc index 754f4d96..92bbbd41 100644 --- a/recipes/libfontenc +++ b/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} } diff --git a/recipes/libgcrypt b/recipes/libgcrypt index 66a50fc4..73eab319 100644 --- a/recipes/libgcrypt +++ b/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} } diff --git a/recipes/libgpg-error b/recipes/libgpg-error index d4043d98..ec6347fd 100644 --- a/recipes/libgpg-error +++ b/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} } diff --git a/recipes/libice b/recipes/libice index e7210f0c..1a74dbc3 100644 --- a/recipes/libice +++ b/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} } diff --git a/recipes/libiconv b/recipes/libiconv index 202f0a6d..2cdf2583 100644 --- a/recipes/libiconv +++ b/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} } diff --git a/recipes/libintl b/recipes/libintl index 6abcbf1b..20b34a2e 100644 --- a/recipes/libintl +++ b/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} } diff --git a/recipes/libjpeg-turbo b/recipes/libjpeg-turbo index 298181c5..7a668b51 100644 --- a/recipes/libjpeg-turbo +++ b/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} } diff --git a/recipes/libpng b/recipes/libpng index e0098418..9e6be7e3 100644 --- a/recipes/libpng +++ b/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} } diff --git a/recipes/libsm b/recipes/libsm index 23574d98..987292fb 100644 --- a/recipes/libsm +++ b/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} } diff --git a/recipes/libx11 b/recipes/libx11 index 330c4abe..2262a9be 100644 --- a/recipes/libx11 +++ b/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} } diff --git a/recipes/libxaw b/recipes/libxaw index 4ed68513..221a79ce 100644 --- a/recipes/libxaw +++ b/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} } diff --git a/recipes/libxcb b/recipes/libxcb index 7316518a..6cfc770c 100644 --- a/recipes/libxcb +++ b/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} } diff --git a/recipes/libxcrypt b/recipes/libxcrypt index 8cb53e56..eaaab93a 100644 --- a/recipes/libxcrypt +++ b/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} } diff --git a/recipes/libxcursor b/recipes/libxcursor index cf631931..7ea2985e 100644 --- a/recipes/libxcursor +++ b/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} } diff --git a/recipes/libxcvt b/recipes/libxcvt index 19c8158c..d1567edd 100644 --- a/recipes/libxcvt +++ b/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 } diff --git a/recipes/libxdamage b/recipes/libxdamage index 2f79bc8d..5caf3b7f 100644 --- a/recipes/libxdamage +++ b/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} } diff --git a/recipes/libxext b/recipes/libxext index c92c92a5..02fb4794 100644 --- a/recipes/libxext +++ b/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} } diff --git a/recipes/libxfixes b/recipes/libxfixes index 7179c6d4..ea90a5fc 100644 --- a/recipes/libxfixes +++ b/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} } diff --git a/recipes/libxfont2 b/recipes/libxfont2 index 7d2ca98b..2d761225 100644 --- a/recipes/libxfont2 +++ b/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} } diff --git a/recipes/libxft b/recipes/libxft index 174b2020..80b45111 100644 --- a/recipes/libxft +++ b/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" diff --git a/recipes/libxi b/recipes/libxi index 3c3728b9..cb4aa6cb 100644 --- a/recipes/libxi +++ b/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} } diff --git a/recipes/libxinerama b/recipes/libxinerama index fb5d44a3..09bc4575 100644 --- a/recipes/libxinerama +++ b/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} } diff --git a/recipes/libxml b/recipes/libxml index 4cdf61e4..36687bba 100644 --- a/recipes/libxml +++ b/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} } diff --git a/recipes/libxmu b/recipes/libxmu index 9fc57544..a40cb4fb 100644 --- a/recipes/libxmu +++ b/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} } diff --git a/recipes/libxpm b/recipes/libxpm index f0495d96..8601dcb7 100644 --- a/recipes/libxpm +++ b/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} } diff --git a/recipes/libxrandr b/recipes/libxrandr index eb448587..30f6f9c5 100644 --- a/recipes/libxrandr +++ b/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} } diff --git a/recipes/libxrender b/recipes/libxrender index 10607645..8e5cdd20 100644 --- a/recipes/libxrender +++ b/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} } diff --git a/recipes/libxt b/recipes/libxt index 0d9aa822..66b4a2ab 100644 --- a/recipes/libxt +++ b/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} } diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm index f8e66dc2..c1aef1fe 100644 --- a/recipes/libxxf86vm +++ b/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} } diff --git a/recipes/limine b/recipes/limine index b598ceb1..e2e05a0b 100644 --- a/recipes/limine +++ b/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} } diff --git a/recipes/links b/recipes/links index 1b8d180a..16427a71 100644 --- a/recipes/links +++ b/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} } diff --git a/recipes/linux-headers b/recipes/linux-headers index 8d9da1d2..ecd31dfd 100644 --- a/recipes/linux-headers +++ b/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 diff --git a/recipes/llvm b/recipes/llvm index 2cae6d2c..15b59524 100644 --- a/recipes/llvm +++ b/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} } diff --git a/recipes/make b/recipes/make index 1fa58be5..15fef7a5 100644 --- a/recipes/make +++ b/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} } diff --git a/recipes/mesa b/recipes/mesa index 770c3e18..09bd8fc9 100644 --- a/recipes/mesa +++ b/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} } diff --git a/recipes/mesa-demos b/recipes/mesa-demos index ebb1b8b3..daa52e72 100644 --- a/recipes/mesa-demos +++ b/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} } diff --git a/recipes/mkfontscale b/recipes/mkfontscale index 5a9d0c6f..5d96befa 100644 --- a/recipes/mkfontscale +++ b/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} } diff --git a/recipes/mlibc b/recipes/mlibc index c3d8830f..618b65e8 100644 --- a/recipes/mlibc +++ b/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 } diff --git a/recipes/mlibc-headers b/recipes/mlibc-headers index c4873fcf..1cc0e4cb 100644 --- a/recipes/mlibc-headers +++ b/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 diff --git a/recipes/mount b/recipes/mount index a55a0830..0a708124 100644 --- a/recipes/mount +++ b/recipes/mount @@ -1,7 +1,7 @@ name=mount revision=1 from_source=mount -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xbinutils xgcc" deps="base" diff --git a/recipes/mpc b/recipes/mpc index 7112d237..16132f97 100644 --- a/recipes/mpc +++ b/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} } diff --git a/recipes/mpfr b/recipes/mpfr index e296e065..d17f2951 100644 --- a/recipes/mpfr +++ b/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} } diff --git a/recipes/nano b/recipes/nano index 94461cbc..165ef63f 100644 --- a/recipes/nano +++ b/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' } diff --git a/recipes/nasm b/recipes/nasm index f73d627a..cea20042 100644 --- a/recipes/nasm +++ b/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} } diff --git a/recipes/ncurses b/recipes/ncurses index 1f95908e..f21ee6ef 100644 --- a/recipes/ncurses +++ b/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} } diff --git a/recipes/netd b/recipes/netd index 893a6acb..4a19b195 100644 --- a/recipes/netd +++ b/recipes/netd @@ -1,7 +1,7 @@ name=netd revision=1 from_source=netd -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xbinutils xgcc" deps="base" diff --git a/recipes/nyancat b/recipes/nyancat index 1bea34a9..e05b6947 100644 --- a/recipes/nyancat +++ b/recipes/nyancat @@ -1,7 +1,7 @@ name=nyancat revision=1 from_source=nyancat -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils" deps="base" diff --git a/recipes/openssh b/recipes/openssh index 19d6c511..2864ecfd 100644 --- a/recipes/openssh +++ b/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} } diff --git a/recipes/openssl b/recipes/openssl index 1e93a49b..48d23feb 100644 --- a/recipes/openssl +++ b/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} } diff --git a/recipes/oss b/recipes/oss index 69572382..c3f89c8a 100644 --- a/recipes/oss +++ b/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} } diff --git a/recipes/pcre2 b/recipes/pcre2 index 59ccf3dd..897d2d53 100644 --- a/recipes/pcre2 +++ b/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} } diff --git a/recipes/pixman b/recipes/pixman index 7637fba7..3a0370d7 100644 --- a/recipes/pixman +++ b/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 } diff --git a/recipes/python b/recipes/python index 63f48351..cb419a3d 100644 --- a/recipes/python +++ b/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} } diff --git a/recipes/qemu b/recipes/qemu index 8eeb457e..2c6f93cc 100644 --- a/recipes/qemu +++ b/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} } diff --git a/recipes/readline b/recipes/readline index 3d7063c5..8447319b 100644 --- a/recipes/readline +++ b/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" } diff --git a/recipes/sdl2 b/recipes/sdl2 index 3d5cad1a..c3839450 100644 --- a/recipes/sdl2 +++ b/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} } diff --git a/recipes/sed b/recipes/sed index a54c3605..6424dc9c 100644 --- a/recipes/sed +++ b/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} } diff --git a/recipes/shadow b/recipes/shadow index b1803697..7914bf33 100644 --- a/recipes/shadow +++ b/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} } diff --git a/recipes/sudo b/recipes/sudo index 28937d6f..6ff3512f 100644 --- a/recipes/sudo +++ b/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} } diff --git a/recipes/tar b/recipes/tar index 8c9fcb7a..f6e3753c 100644 --- a/recipes/tar +++ b/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} } diff --git a/recipes/twm b/recipes/twm index 3bd3d193..984d50fd 100644 --- a/recipes/twm +++ b/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} } diff --git a/recipes/tyrquake b/recipes/tyrquake index 4063d517..d09e204a 100644 --- a/recipes/tyrquake +++ b/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 } diff --git a/recipes/util-macros b/recipes/util-macros index da1c0beb..76ceb4e5 100644 --- a/recipes/util-macros +++ b/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} } diff --git a/recipes/vim b/recipes/vim index 7839397c..468c244f 100644 --- a/recipes/vim +++ b/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} } diff --git a/recipes/wget b/recipes/wget index d1dbdc43..46ba65d7 100644 --- a/recipes/wget +++ b/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} } diff --git a/recipes/xauth b/recipes/xauth index d62270cc..831c2af4 100644 --- a/recipes/xauth +++ b/recipes/xauth @@ -1,12 +1,15 @@ name=xauth revision=1 from_source=xauth -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils pkgconfig xorgproto" deps="base libx11 libxaw libxext libxmu" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xbitmaps b/recipes/xbitmaps index c4a850f7..0773bb44 100644 --- a/recipes/xbitmaps +++ b/recipes/xbitmaps @@ -1,7 +1,7 @@ name=xbitmaps revision=1 from_source=xbitmaps -imagedeps="meson base-devel" +imagedeps="meson build-essential" hostdeps="xgcc xbinutils pkgconfig util-macros" deps="base" diff --git a/recipes/xcb-proto b/recipes/xcb-proto index 98b4e254..9d065228 100644 --- a/recipes/xcb-proto +++ b/recipes/xcb-proto @@ -1,12 +1,15 @@ name=xcb-proto revision=1 from_source=xcb-proto -imagedeps="base-devel python3" +imagedeps="build-essential python3" hostdeps="xgcc xbinutils" deps="base" -build() { +configure() { PYTHON=python3 ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} +} + +build() { make -j ${parallelism} } diff --git a/recipes/xclock b/recipes/xclock index 46435a42..ca91540d 100644 --- a/recipes/xclock +++ b/recipes/xclock @@ -1,12 +1,15 @@ name=xclock revision=1 from_source=xclock -imagedeps="meson ninja base-devel" +imagedeps="meson ninja-build build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base xorg-server libxmu libxaw libxft" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xedit b/recipes/xedit index dc2c3271..cda7cc51 100644 --- a/recipes/xedit +++ b/recipes/xedit @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" deps="base libx11 xorgproto libxt libxaw libxmu" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xev b/recipes/xev index dde8c99f..ecf83ed6 100644 --- a/recipes/xev +++ b/recipes/xev @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" deps="base libx11 xorgproto libxrandr" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xeyes b/recipes/xeyes index c88292cc..6d28b006 100644 --- a/recipes/xeyes +++ b/recipes/xeyes @@ -1,12 +1,15 @@ name=xeyes revision=1 from_source=xeyes -imagedeps="meson ninja base-devel" +imagedeps="meson ninja-build build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base xorg-server libxt libxmu libxext libxi libxrender" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xf86-input-keyboard b/recipes/xf86-input-keyboard index 9f0ad6c5..93bed621 100644 --- a/recipes/xf86-input-keyboard +++ b/recipes/xf86-input-keyboard @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" deps="base xorg-server" -build() { +configure() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static +} + +build() { make -j${parallelism} } diff --git a/recipes/xf86-input-mouse b/recipes/xf86-input-mouse index 942b86f3..fd7f696a 100644 --- a/recipes/xf86-input-mouse +++ b/recipes/xf86-input-mouse @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" deps="base xorg-server" -build() { +configure() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static +} + +build() { make -j${parallelism} } diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev index 9767b614..08d8d2ce 100644 --- a/recipes/xf86-video-fbdev +++ b/recipes/xf86-video-fbdev @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" deps="base xorg-server" -build() { +configure() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static --disable-pciaccess +} + +build() { make -j${parallelism} } diff --git a/recipes/xfishtank b/recipes/xfishtank index fdb68a32..e0f5590a 100644 --- a/recipes/xfishtank +++ b/recipes/xfishtank @@ -1,7 +1,7 @@ name=xfishtank revision=1 from_source=xfishtank -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils libtool pkgconfig" deps="base imlib2" diff --git a/recipes/xfontalias b/recipes/xfontalias index d41035a2..351730bc 100644 --- a/recipes/xfontalias +++ b/recipes/xfontalias @@ -1,12 +1,15 @@ name=xfontalias revision=1 from_source=xfontalias -imagedeps="gcc xorg-mkfontscale" +imagedeps="gcc xfonts-base" hostdeps="xgcc xbinutils pkgconfig util-macros fontutil" deps="base" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xfontmiscethipic b/recipes/xfontmiscethipic index 01451449..bfa181ce 100644 --- a/recipes/xfontmiscethipic +++ b/recipes/xfontmiscethipic @@ -1,12 +1,15 @@ name=xfontmiscethipic revision=1 from_source=xfontmiscethipic -imagedeps="gcc xorg-mkfontscale" +imagedeps="gcc xfonts-base" hostdeps="xgcc xbinutils pkgconfig util-macros fontutil" deps="base" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xfontmiscmisc b/recipes/xfontmiscmisc index 733c938f..60306d50 100644 --- a/recipes/xfontmiscmisc +++ b/recipes/xfontmiscmisc @@ -1,12 +1,15 @@ name=xfontmiscmisc revision=1 from_source=xfontmiscmisc -imagedeps="gcc xorg-bdftopcf xorg-mkfontscale" +imagedeps="gcc xfonts-base xfonts-base" hostdeps="xgcc xbinutils pkgconfig fontutil" deps="base fontutil" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --with-fontrootdir=${prefix}/share/fonts/X11 +} + +build() { make -j${parallelism} } diff --git a/recipes/xkbcomp b/recipes/xkbcomp index bf6224c1..ca9cca9e 100644 --- a/recipes/xkbcomp +++ b/recipes/xkbcomp @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" deps="base libxcb xcb-proto xkbfile" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xkbfile b/recipes/xkbfile index 5643a496..db82c587 100644 --- a/recipes/xkbfile +++ b/recipes/xkbfile @@ -1,12 +1,15 @@ name=xkbfile revision=1 from_source=xkbfile -imagedeps="meson ninja gcc" +imagedeps="meson ninja-build gcc" hostdeps="xgcc xbinutils pkgconfig" deps="base xorgproto libx11" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xkeyboardconfig b/recipes/xkeyboardconfig index fabc811e..186b669e 100644 --- a/recipes/xkeyboardconfig +++ b/recipes/xkeyboardconfig @@ -1,12 +1,15 @@ name=xkeyboardconfig revision=1 from_source=xkeyboardconfig -imagedeps="gcc meson ninja" +imagedeps="gcc meson ninja-build" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" deps="base" -build() { +configure() { meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} ${source_dir} +} + +build() { ninja } diff --git a/recipes/xneko b/recipes/xneko index 69e06248..9bdf536e 100644 --- a/recipes/xneko +++ b/recipes/xneko @@ -1,7 +1,7 @@ name=xneko revision=1 from_source=xneko -imagedeps="meson ninja base-devel" +imagedeps="meson ninja-build build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base libx11" diff --git a/recipes/xorg-server b/recipes/xorg-server index e1825d57..a3add5a6 100644 --- a/recipes/xorg-server +++ b/recipes/xorg-server @@ -1,12 +1,15 @@ name=xorg-server revision=1 from_source=xorg-server -imagedeps="meson ninja base-devel" +imagedeps="meson ninja-build build-essential" hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros xtrans fontutil" deps="base libxcvt pixman xorgproto xtrans xkbfile libxfont2 fontutil libgcrypt freetype xkeyboardconfig xkbcomp libxi libxrender libxcb libxext pixman libxdamage" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-pciaccess --disable-libdrm --disable-glx --disable-int10-module --disable-glamor --disable-vgahw --disable-dri3 --disable-dri2 --disable-dri --disable-xephyr --disable-xwayland --disable-xnest --disable-dmx --with-fontrootdir=${prefix}/share/fonts/X11 +} + +build() { make -j${parallelism} } diff --git a/recipes/xorgproto b/recipes/xorgproto index 622401d0..c6354600 100644 --- a/recipes/xorgproto +++ b/recipes/xorgproto @@ -1,12 +1,15 @@ name=xorgproto revision=1 from_source=xorgproto -imagedeps="meson ninja gcc" +imagedeps="meson ninja-build gcc build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base" -build() { +configure() { meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} -Dlegacy=true ${source_dir} +} + +build() { ninja } diff --git a/recipes/xrandr b/recipes/xrandr index 72ddacb0..b42ccb1e 100644 --- a/recipes/xrandr +++ b/recipes/xrandr @@ -5,8 +5,11 @@ imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" deps="base xorgproto libx11 libxrandr" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xscreensaver b/recipes/xscreensaver index effbc7b3..493633fb 100644 --- a/recipes/xscreensaver +++ b/recipes/xscreensaver @@ -1,12 +1,15 @@ name=xscreensaver revision=1 from_source=xscreensaver -imagedeps="meson ninja base-devel intltool" +imagedeps="meson build-essential intltool" hostdeps="xgcc xbinutils pkgconfig" deps="base libxcrypt libx11 libxt libjpeg-turbo libpng libxft libxext libxi mesa glu" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --with-glx +} + +build() { make -j${parallelism} } diff --git a/recipes/xsetroot b/recipes/xsetroot index a37ee2bb..12bc8b80 100644 --- a/recipes/xsetroot +++ b/recipes/xsetroot @@ -1,12 +1,15 @@ name=xsetroot revision=1 from_source=xsetroot -imagedeps="meson ninja base-devel" +imagedeps="meson build-essential" hostdeps="xgcc xbinutils pkgconfig" deps="base xorg-server libxmu xbitmaps libxcursor" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/xterm b/recipes/xterm index 04693c9a..76a7a433 100644 --- a/recipes/xterm +++ b/recipes/xterm @@ -1,12 +1,15 @@ name=xterm revision=1 from_source=xterm -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils pkgconfig libtool" deps="base libx11 libxaw ncurses" -build() { +configure() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-tcap-fkeys --disable-tcap-query --enable-256-color +} + +build() { make -j ${parallelism} SHLIB_LIBS="-ltinfow" } diff --git a/recipes/xtrans b/recipes/xtrans index ec064da8..3a4ccd10 100644 --- a/recipes/xtrans +++ b/recipes/xtrans @@ -1,12 +1,15 @@ name=xtrans revision=1 from_source=xtrans -imagedeps="meson ninja gcc" +imagedeps="meson ninja-build gcc" hostdeps="xgcc xbinutils pkgconfig util-macros" deps="base" -build() { +configure() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral +} + +build() { make -j${parallelism} } diff --git a/recipes/zlib b/recipes/zlib index 4c0b9fd8..3ac124de 100644 --- a/recipes/zlib +++ b/recipes/zlib @@ -1,12 +1,15 @@ name=zlib revision=1 from_source=zlib -imagedeps="base-devel" +imagedeps="build-essential" hostdeps="xgcc xbinutils" deps="base" -build() { +configure() { CHOST=x86_64-astral prefix=${prefix} ${source_dir}/configure +} + +build() { make -j${parallelism} } diff --git a/source-recipes/ace-of-penguins b/source-recipes/ace-of-penguins index acc30c78..5e7af4fc 100644 --- a/source-recipes/ace-of-penguins +++ b/source-recipes/ace-of-penguins @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.delorie.com/store/ace/ace-1.4.tar.gz" tarball_sha512=cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/astral b/source-recipes/astral index 25864c22..37691e3c 100644 --- a/source-recipes/astral +++ b/source-recipes/astral @@ -5,7 +5,7 @@ allow_network="yes" imagedeps="wget" flanterm_commit="347d9cf1e3fced64aa20ab278e2fdcc834086035" -regenerate() { +prepare() { rm -f include/limine.h rm -f io/printf.c rm -f include/printf.h diff --git a/source-recipes/autoconf b/source-recipes/autoconf index 5dc12eeb..93357640 100644 --- a/source-recipes/autoconf +++ b/source-recipes/autoconf @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/autoconf/autoconf-${version}.tar.xz" tarball_sha512="995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b" -regenerate() { +prepare() { true } diff --git a/source-recipes/autoconf-archive b/source-recipes/autoconf-archive index 9fe7e729..1da152ee 100644 --- a/source-recipes/autoconf-archive +++ b/source-recipes/autoconf-archive @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz" tarball_sha512="157b5b6a979d5ec5bfab6ddf34422da620fec1e95f4c901821abbb7361544af77747b4a449029b84750d75679d6130a591e98da8772de2c121ecdea163f0340b" -regenerate() { +prepare() { true } diff --git a/source-recipes/automake b/source-recipes/automake index 5926072f..ffcadd13 100644 --- a/source-recipes/automake +++ b/source-recipes/automake @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/automake/automake-${version}.tar.gz" tarball_sha512="f0d4717ebe2c76cec5d487de090f6e1c0f784b0d382fd964ffa846287e2a364a52531a26ab98b7033ac04ed302a247b3b114299def54819a03439bfc962ff61b" -regenerate() { +prepare() { true } diff --git a/source-recipes/bash b/source-recipes/bash index d95a7ca9..3dd5b049 100644 --- a/source-recipes/bash +++ b/source-recipes/bash @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz" tarball_sha512=c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c -regenerate() { +prepare() { true } diff --git a/source-recipes/binutils b/source-recipes/binutils index c7417f11..79f2d5f9 100644 --- a/source-recipes/binutils +++ b/source-recipes/binutils @@ -5,7 +5,7 @@ tarball_url="https://ftpmirror.gnu.org/binutils/binutils-${version}.tar.xz" tarball_sha512="68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3" hostdeps="autoconf automake" -regenerate() { +prepare() { (cd ld && automake) } diff --git a/source-recipes/bzip2 b/source-recipes/bzip2 index d93595af..391f027e 100644 --- a/source-recipes/bzip2 +++ b/source-recipes/bzip2 @@ -5,6 +5,6 @@ tarball_url="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz" tarball_sha512=083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { true } diff --git a/source-recipes/cmake b/source-recipes/cmake index 21c65bfb..8c0cbba2 100644 --- a/source-recipes/cmake +++ b/source-recipes/cmake @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}.tar.gz" tarball_sha512="0dad9e0e3ad9c1178d337cd3a14e9ce145e011175e9d9fce4961d12b8fe37091f9fdf05f4303cdd846408955b11bac3cfe5064f852833b99e31f5a7b82a9d1eb" -regenerate() { +prepare() { true } diff --git a/source-recipes/coreutils b/source-recipes/coreutils index 5face6a5..d4221cd4 100644 --- a/source-recipes/coreutils +++ b/source-recipes/coreutils @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/coreutils/coreutils-${version}.tar.xz" tarball_sha512=a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/curl b/source-recipes/curl index 1a391e91..7542d59c 100644 --- a/source-recipes/curl +++ b/source-recipes/curl @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/curl/curl/releases/download/curl-8_8_0/curl-${version}.tar.xz" tarball_sha512="9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a" hostdeps="autoconf automake pkgconfig libtool autoconf-archive" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/diffutils b/source-recipes/diffutils index 85d3e0cb..7dad0c10 100644 --- a/source-recipes/diffutils +++ b/source-recipes/diffutils @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz" tarball_sha512="d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/distro-files b/source-recipes/distro-files index 560728da..ae062a6f 100644 --- a/source-recipes/distro-files +++ b/source-recipes/distro-files @@ -2,6 +2,6 @@ name=distro-files version=0 source_dir="distro-files" -regenerate() { +prepare() { true } diff --git a/source-recipes/doomgeneric b/source-recipes/doomgeneric index 2435b743..b6df9c0e 100644 --- a/source-recipes/doomgeneric +++ b/source-recipes/doomgeneric @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/ozkl/doomgeneric/archive/b694f097ab8271c0a59bb52de631cbaf42ae0fa7.tar.gz" tarball_sha512=b1e71af6bb762a1eb3be71b4cbb43abba41a246d4232f4e3cb8efe9a4c268a3f1adbde14cc6636f8ea4e7475a4f56951dbaadc5f01eeb319a2f98fa0324d9e16 -regenerate() { +prepare() { true } diff --git a/source-recipes/e2fsprogs b/source-recipes/e2fsprogs index de3d712e..21b30720 100644 --- a/source-recipes/e2fsprogs +++ b/source-recipes/e2fsprogs @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/tytso/e2fsprogs/archive/refs/tags/v1.47.0.tar.gz" tarball_sha512=9cb895f7deed8ee513595b7c232db8345cb7e54e6cbb33e6eeab31c860c892cbc9d721756ac1429e6731e219e1c6aacc25075d517e979397c66bf764bc8bc9fa -regenerate() { +prepare() { true } diff --git a/source-recipes/file b/source-recipes/file index 8bc75f8c..0d4cafa4 100644 --- a/source-recipes/file +++ b/source-recipes/file @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/file/file/archive/refs/tags/FILE5_${version}.tar.gz" tarball_sha512="fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/findutils b/source-recipes/findutils index 41e83b61..2d893cb8 100644 --- a/source-recipes/findutils +++ b/source-recipes/findutils @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/findutils/findutils-${version}.tar.xz" tarball_sha512="ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/fontconfig b/source-recipes/fontconfig index 6782519a..ee947370 100644 --- a/source-recipes/fontconfig +++ b/source-recipes/fontconfig @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${version}.tar.xz" tarball_sha512="a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/fontutil b/source-recipes/fontutil index 841a9834..163199af 100644 --- a/source-recipes/fontutil +++ b/source-recipes/fontutil @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive//individual/font/font-util-${version}.tar.xz" tarball_sha512="cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0" hostdeps="automake autoconf libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/freestnd-c-hdrs b/source-recipes/freestnd-c-hdrs index d2678354..e79385c3 100644 --- a/source-recipes/freestnd-c-hdrs +++ b/source-recipes/freestnd-c-hdrs @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/osdev0/freestnd-c-hdrs/archive/${version}.tar.gz" tarball_sha512=87f5e1d98539142da216766a269792ae4ee0a02abd02e8af45c33514866a408e01eca03bd6122574b3000b2234ab40f31c846a99d882162c6ecd89d0b08779e8 -regenerate() { +prepare() { true } diff --git a/source-recipes/freestnd-cxx-hdrs b/source-recipes/freestnd-cxx-hdrs index f29f77b6..587b8aab 100644 --- a/source-recipes/freestnd-cxx-hdrs +++ b/source-recipes/freestnd-cxx-hdrs @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/osdev0/freestnd-cxx-hdrs/archive/${version}.tar.gz" tarball_sha512=39e25168ba5dcfad0b222c82d84d9c01337c989afb3aaaf61be4bef71cde0e7f618e7a6ab475b0b6372ef95b47ab915c4f4c61182a1292f04083fa4b24714569 -regenerate() { +prepare() { true } diff --git a/source-recipes/freetype b/source-recipes/freetype index 17572861..cbd9d08d 100644 --- a/source-recipes/freetype +++ b/source-recipes/freetype @@ -4,7 +4,7 @@ source_method=tarball tarball_url="https://downloads.sourceforge.net/freetype/freetype-${version}.tar.xz" tarball_sha512="6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f" hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { ./autogen.sh cp /usr/local/share/automake-*/config.sub builds/unix/ } diff --git a/source-recipes/frigg b/source-recipes/frigg index 2282fd9e..32aacbdc 100644 --- a/source-recipes/frigg +++ b/source-recipes/frigg @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/managarm/frigg/archive/${version}.tar.gz" tarball_sha512=d7011bcb0b2adfe88968de7cf9080fc71664725784491e66266b34b7fd83c2e3005f8ba7b530116075a7f5f7b31103af9aef1b32dab3143ed9ae3a247d2aa655 -regenerate() { +prepare() { true } diff --git a/source-recipes/fvwm b/source-recipes/fvwm index 799a4ca1..39f3e39f 100644 --- a/source-recipes/fvwm +++ b/source-recipes/fvwm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/fvwmorg/fvwm3/releases/download/${version}/fvwm3-${version}.tar.gz" tarball_sha512="47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/gawk b/source-recipes/gawk index 941724c8..a5f61463 100644 --- a/source-recipes/gawk +++ b/source-recipes/gawk @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/gawk/gawk-${version}.tar.xz" tarball_sha512="90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { sed -i 's/extras//' Makefile.in } diff --git a/source-recipes/gcc b/source-recipes/gcc index 67f5b5a0..af27cd57 100644 --- a/source-recipes/gcc +++ b/source-recipes/gcc @@ -5,6 +5,6 @@ tarball_url="https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz" tarball_sha512="2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900" hostdeps="automake autoconf" -regenerate() { +prepare() { (cd libstdc++-v3 && autoconf) } diff --git a/source-recipes/gettext b/source-recipes/gettext index f4fefe94..88187630 100644 --- a/source-recipes/gettext +++ b/source-recipes/gettext @@ -5,7 +5,7 @@ tarball_url="https://ftp.gnu.org/gnu/gettext/gettext-${version}.tar.gz" tarball_sha512=d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { ( cd gettext-runtime/libasprintf && autoreconf -fvi ) ( cd gettext-runtime/intl && autoreconf -fvi ) ( cd gettext-runtime && autoreconf -fvi ) diff --git a/source-recipes/git b/source-recipes/git index 8d4df32f..991815d4 100644 --- a/source-recipes/git +++ b/source-recipes/git @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" tarball_sha512="dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/glib b/source-recipes/glib index b2b73f98..ec248f96 100644 --- a/source-recipes/glib +++ b/source-recipes/glib @@ -3,6 +3,6 @@ version=2.82 source_method=tarball tarball_url="https://download.gnome.org/sources/glib/${version}/glib-${version}.0.tar.xz" tarball_sha512="7ce4dbc2b80fea1dca722bea02b1c35404108747b94c296760469b5416fc5ca737fc29c56a091120e5457a732656761424da614f3a626eb79b80b145507deb00" -regenerate() { +prepare() { true } diff --git a/source-recipes/glu b/source-recipes/glu index 27517887..993b621b 100644 --- a/source-recipes/glu +++ b/source-recipes/glu @@ -3,6 +3,6 @@ version=9.0.3 source_method=tarball tarball_url="https://archive.mesa3d.org/glu/glu-${version}.tar.xz" tarball_sha512="b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba" -regenerate() { +prepare() { true } diff --git a/source-recipes/gmp b/source-recipes/gmp index 1e10b683..b64e87d8 100644 --- a/source-recipes/gmp +++ b/source-recipes/gmp @@ -5,6 +5,6 @@ tarball_url="https://gmplib.org/download/gmp/gmp-${version}.tar.xz" tarball_sha512=c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/grep b/source-recipes/grep index c7ba996c..9b3f60fd 100644 --- a/source-recipes/grep +++ b/source-recipes/grep @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/grep/grep-${version}.tar.xz" tarball_sha512="f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/gzip b/source-recipes/gzip index 14f11180..19ce8a1a 100644 --- a/source-recipes/gzip +++ b/source-recipes/gzip @@ -5,6 +5,6 @@ tarball_url="https://ftp.gnu.org/gnu/gzip/gzip-${version}.tar.gz" tarball_sha512=8d78cea6770bf53c744ee1f6435af96921883b5910d14a10ced695279ad057f316de7228ad45ad4294fdd4dd0dacf86576094d11731c4d64cbafef00bc49a5a1 hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/imlib2 b/source-recipes/imlib2 index 11848ec8..81ee1eb5 100644 --- a/source-recipes/imlib2 +++ b/source-recipes/imlib2 @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://downloads.sourceforge.net/enlightenment/imlib2-${version}.tar.xz" tarball_sha512=79feea73fb67508ffdce52f8430c2c887b06d8bcb70f6e3bc551c86d521ebf61fc1eff10994b69def4d7a237873f107066aefa367e05b5f89b5d675751d9314f hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/init b/source-recipes/init index 5adc712c..f063da82 100644 --- a/source-recipes/init +++ b/source-recipes/init @@ -2,6 +2,6 @@ name=init version=0 source_dir="tools/init" -regenerate() { +prepare() { true } diff --git a/source-recipes/less b/source-recipes/less index c8876e2a..7d275b7d 100644 --- a/source-recipes/less +++ b/source-recipes/less @@ -5,6 +5,6 @@ tarball_url="http://greenwoodsoftware.com/less/less-${version}.tar.gz" tarball_sha512=6a324ac54e22429ac652dc303bc1fe48933555d1cbf8ad7ecf345940910c014fef9551a3219743cfb7115e356b5841ae97d6ce62e7a1ba1e3300d243efca34d9 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/libXau b/source-recipes/libXau index 86cb9fdc..bf33da22 100644 --- a/source-recipes/libXau +++ b/source-recipes/libXau @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/lib/libXau-${version}.tar.bz2" tarball_sha512="3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562" hostdeps="autoconf automake pkgconfig xorgproto libtool util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libXdmcp b/source-recipes/libXdmcp index a741cf3b..81921194 100644 --- a/source-recipes/libXdmcp +++ b/source-recipes/libXdmcp @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/lib/libXdmcp-${version}.tar.bz2" tarball_sha512="cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec" hostdeps="autoconf automake libtool pkgconfig xorgproto util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libevent b/source-recipes/libevent index b9d85034..4d72c82b 100644 --- a/source-recipes/libevent +++ b/source-recipes/libevent @@ -5,6 +5,6 @@ tarball_url="https://github.com/libevent/libevent/releases/download/release-${ve tarball_sha512=88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libexpat b/source-recipes/libexpat index cfbec212..d672db88 100644 --- a/source-recipes/libexpat +++ b/source-recipes/libexpat @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/libexpat/libexpat/releases/download/R_2_4_9/expat-${version}.tar.xz" tarball_sha512="8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libffi b/source-recipes/libffi index 32ed5768..f86db999 100644 --- a/source-recipes/libffi +++ b/source-recipes/libffi @@ -5,6 +5,6 @@ tarball_url="https://github.com/libffi/libffi/releases/download/v${version}/libf tarball_sha512=31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1 hostdeps="autoconf automake libtool pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libfontenc b/source-recipes/libfontenc index dec2f67b..c1d74887 100644 --- a/source-recipes/libfontenc +++ b/source-recipes/libfontenc @@ -3,8 +3,8 @@ version=1.1.6 source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libfontenc-${version}.tar.gz" tarball_sha512="0fec921d23ef6680b563f37bebc63d9a70a8d9adfe158c31e62cbb2cacb55086fd55932c146a9b3a758725f0130bd649979b100e8a631b64aa453121a9e2beef" -imagedeps="xorg-font-util" +#imagedeps="xfonts-util" hostdeps="autoconf automake libtool pkgconfig util-macros fontutil" -regenerate() { +prepare() { autoreconf -fvi --verbose && libtoolize -cvf } diff --git a/source-recipes/libgcrypt b/source-recipes/libgcrypt index 91cea4c5..f40ef92d 100644 --- a/source-recipes/libgcrypt +++ b/source-recipes/libgcrypt @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2" tarball_sha512="e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13" hostdeps="libtool automake autoconf pkgconfig" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libgpg-error b/source-recipes/libgpg-error index e6a5011b..8ee3ed33 100644 --- a/source-recipes/libgpg-error +++ b/source-recipes/libgpg-error @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${version}.tar.bz2" tarball_sha512="882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457" hostdeps="automake autoconf pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libice b/source-recipes/libice index 6c503eb2..7ac6578b 100644 --- a/source-recipes/libice +++ b/source-recipes/libice @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libICE-${version}.tar.gz" tarball_sha512="2d4757f7325eb01180b5d7433cc350eb9606bd3afe82dabc8aa164feda75ef03a0624d74786e655c536c24a80d0ccb2f1e3ecbb04d3459b23f85455006ca8a91" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libiconv b/source-recipes/libiconv index 4ef33f66..51134931 100644 --- a/source-recipes/libiconv +++ b/source-recipes/libiconv @@ -5,7 +5,7 @@ tarball_url="https://ftp.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz" tarball_sha512=18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { cp -v /usr/local/share/aclocal/libtool.m4 ./m4/ cp -v /usr/local/share/aclocal/libtool.m4 ./libcharset/m4/ cp -v /usr/local/share/libtool/build-aux/ltmain.sh ./build-aux/ diff --git a/source-recipes/libjpeg-turbo b/source-recipes/libjpeg-turbo index 4c675be2..31ed3994 100644 --- a/source-recipes/libjpeg-turbo +++ b/source-recipes/libjpeg-turbo @@ -3,6 +3,6 @@ version=3.0.3 source_method=tarball tarball_url="https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${version}/libjpeg-turbo-${version}.tar.gz" tarball_sha512=7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129 -regenerate() { +prepare() { true } diff --git a/source-recipes/libpng b/source-recipes/libpng index 498a4b1f..0b1eb2c0 100644 --- a/source-recipes/libpng +++ b/source-recipes/libpng @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://downloads.sourceforge.net/libpng/libpng-${version}.tar.xz" tarball_sha512=59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/libsm b/source-recipes/libsm index e93a3a91..3afdb1fb 100644 --- a/source-recipes/libsm +++ b/source-recipes/libsm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libSM-${version}.tar.gz" tarball_sha512="03b77d86b33cdb3df4f9d65131a0025182f3cb0c17b33a90d236e8563b3011d225b9d006186302d07850edafa5b899aec6a086b8d437d357cd69fedd5f22d94b" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libstb b/source-recipes/libstb index db580215..81dc5cad 100644 --- a/source-recipes/libstb +++ b/source-recipes/libstb @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/nothings/stb/archive/${version}.tar.gz" tarball_sha512=55bc75284cf8a092c527d1ae18c461c9d0ab6aacdcf3b873abde54c06d9b8a0ae249ce47c7ad25809e075bfbb58e9c879d43e1df2708083860c07ac3bbb30d60 -regenerate() { +prepare() { true } diff --git a/source-recipes/libtool b/source-recipes/libtool index cdba8ae7..13306d72 100644 --- a/source-recipes/libtool +++ b/source-recipes/libtool @@ -4,10 +4,10 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/libtool/libtool-${version}.tar.gz" tarball_sha512="27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385" hostdeps="autoconf automake" -imagedeps="base-devel help2man wget git" +imagedeps="build-essential help2man wget git" allow_network="yes" -regenerate() { +prepare() { git clone https://git.savannah.gnu.org/git/gnulib.git cd gnulib git checkout 4b17a1ae49e69df1ac5dc35a4f60b20ab958baf2 diff --git a/source-recipes/libx11 b/source-recipes/libx11 index 035c3d8a..eea2aee3 100644 --- a/source-recipes/libx11 +++ b/source-recipes/libx11 @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libX11-${version}.tar.gz" tarball_sha512="ac73ff99abfc13a0b8d04e3e4fde2a3b97813120c73c4dbf57e0ec56bbde8cd0272f1c09f417f10561f57def22878509adced897ebb2adfc1cb0d30385ee9396" hostdeps="xorgproto autoconf automake libtool pkgconfig util-macros xtrans" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxaw b/source-recipes/libxaw index 4fd661d4..f1275254 100644 --- a/source-recipes/libxaw +++ b/source-recipes/libxaw @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXaw-${version}.tar.gz" tarball_sha512="1205481443627b428f6c447a3926a060af30440badc401ca8d209849faef21ce967cf7f26ab452b47a64071980f9892cce83b2d70db0c2b7d6cabf838ab93884" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxcb b/source-recipes/libxcb index 0e507d0d..69b6572a 100644 --- a/source-recipes/libxcb +++ b/source-recipes/libxcb @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://xorg.freedesktop.org/archive/individual/lib/libxcb-${version}.tar.xz" tarball_sha512="f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9" hostdeps="automake autoconf xorgproto util-macros libtool pkgconfig xtrans" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/libxcrypt b/source-recipes/libxcrypt index 22636f4c..e69abf39 100644 --- a/source-recipes/libxcrypt +++ b/source-recipes/libxcrypt @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz" tarball_sha512="468560e6f90877540d22e32c867cbcf3786983a6fdae6ef86454f4b7f2bbaae1b6589d1af75cda73078fa8f6e91b1a32f8353f26d433246eef7be3e96d4ae1c7" hostdeps="libtool automake autoconf pkgconfig" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxcursor b/source-recipes/libxcursor index f2a9d728..cf3cc0be 100644 --- a/source-recipes/libxcursor +++ b/source-recipes/libxcursor @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXcursor-${version}.tar.gz" tarball_sha512="381c8762b5aa0dedb610e563bc595f901ec06eac0da832be4829f413869ce5092b47b33c2059d816e29dc525e5615358add98c305b9bda63c5ffac8b52b2e287" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxcvt b/source-recipes/libxcvt index fa906c7b..d2db4dd0 100644 --- a/source-recipes/libxcvt +++ b/source-recipes/libxcvt @@ -3,6 +3,6 @@ version=0.1.2 source_method=tarball tarball_url="https://www.x.org/pub/individual/lib/libxcvt-${version}.tar.xz" tarball_sha512="3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0" -regenerate() { +prepare() { true } diff --git a/source-recipes/libxdamage b/source-recipes/libxdamage index b4d8c970..fcce4343 100644 --- a/source-recipes/libxdamage +++ b/source-recipes/libxdamage @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXdamage-${version}.tar.gz" tarball_sha512="fe0bdf86f2bddd3dddd4362e9c83c6cbb894f9384cab41b76a9e6a7e1da1d1187dcb4339868b429dc7ddbf69df86c880b4e2ce6b0fe2f9124ad43dfbde45ed59" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxext b/source-recipes/libxext index bce314e5..efe35fb4 100644 --- a/source-recipes/libxext +++ b/source-recipes/libxext @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXext-${version}.tar.gz" tarball_sha512="4eebd639fd57cb9b84a1e17e368f82fbf3d9f021eef5ad3fe31dd128500db57862a82c1e0d214d447cb7641b2be3fd7e949ee1196f2a482793c6628fb1e5cd70" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxfixes b/source-recipes/libxfixes index fd1c4848..8f3eb256 100644 --- a/source-recipes/libxfixes +++ b/source-recipes/libxfixes @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXfixes-${version}.tar.gz" tarball_sha512="422ff6aa6dddbb5d790ddf351b12556d37312d67b3adc8c276fb507b8278703b30841f81e526f119b9ab53a3bb8c7c5a742a43826287110ef5417dd84f01348a" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxfont2 b/source-recipes/libxfont2 index 1395778b..8d5e2a5d 100644 --- a/source-recipes/libxfont2 +++ b/source-recipes/libxfont2 @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXfont2-${version}.tar.gz" tarball_sha512="58b51281e930b1b99f2eee7edbbc08e5bd34b135dd2ac145d600181557e1a465b3d65fdaae7b964fc39a6e7ad09a0b7cc7026a4c013ef7ff1cdce094723eedac" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/libxft b/source-recipes/libxft index df70f979..fc922b82 100644 --- a/source-recipes/libxft +++ b/source-recipes/libxft @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXft-${version}.tar.gz" tarball_sha512="291bec2cc297a6e39baff5c2dec37017f37f97b438468a6d6b66f496a9987936da6ee2e3ace77e4527d8c5fd09e1dd731b2f042fa74880f667b8a03a913512d2" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxi b/source-recipes/libxi index 3c3c0ffa..4b1bb3bb 100644 --- a/source-recipes/libxi +++ b/source-recipes/libxi @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXi-${version}.tar.gz" tarball_sha512="98b65084065cb28395cbd75213d7b52ac857840237d544714cf3cbddba6f940f93dd5846546365613da02fd5b4cd8c5be01ef2ac34b2503e500ea189e3c81005" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxinerama b/source-recipes/libxinerama index 47c7f97b..cf63b902 100644 --- a/source-recipes/libxinerama +++ b/source-recipes/libxinerama @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXinerama-${version}.tar.gz" tarball_sha512="fa2cc45214cc591da8867dcd7e332312e8d224c390912dc8580f8b15c3c9d8ffc797eee97c20263faf129fbfc6b0d931b6bf10dc04b8ec439b852451886eba75" hostdeps="autoconf automake libtool pkgconfig util-macros xtrans" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxml b/source-recipes/libxml index 5e6157bc..d7d1815c 100644 --- a/source-recipes/libxml +++ b/source-recipes/libxml @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${version}/libxml2-v${version}.tar.gz" tarball_sha512="eb0cef809e189eafb948c313bd82dd49a0871f0b664f5891dd891f46579c48a0929e1d2144f4286e0ac858463e6726e4a7d446678a006f0b299e1f83bb20e98b" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxmu b/source-recipes/libxmu index b7306f77..75485ebf 100644 --- a/source-recipes/libxmu +++ b/source-recipes/libxmu @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXmu-${version}.tar.xz" tarball_sha512="3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxpm b/source-recipes/libxpm index f9b9e5d0..360ec629 100644 --- a/source-recipes/libxpm +++ b/source-recipes/libxpm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXpm-${version}.tar.gz" tarball_sha512="faf9c75f969da2738ab01b7a28c85ad2bb42a4421509769b56ef9ddaabb0eacb1b06553cfcb1daa03d7fdceb1d3a7c5eee078c3bc3f5e3902fec41b82d3f8d82" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxrandr b/source-recipes/libxrandr index 87c52b4b..4bbb3a89 100644 --- a/source-recipes/libxrandr +++ b/source-recipes/libxrandr @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/lib/libXrandr-${version}.tar.gz" tarball_sha512="309df91127ae17d8bb5a4382b22d1cf788733775dfddcb7932b3edb6f4121728daa7bba1e95ee5e250b2f8b03907a2564dcb3d645d7a5ef6314d0d7b09bac75d" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxrender b/source-recipes/libxrender index 504362ef..3d006367 100644 --- a/source-recipes/libxrender +++ b/source-recipes/libxrender @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXrender-${version}.tar.gz" tarball_sha512="48b490f707f39a33b4a408610cababfa45c0942441cc55da9278323791344e8eded1d730f4b003e655e718467964808ef0673df4f74408937e45a7375c7861c4" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxt b/source-recipes/libxt index 6ea0a746..8c6f7110 100644 --- a/source-recipes/libxt +++ b/source-recipes/libxt @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXt-${version}.tar.gz" tarball_sha512="73c2fd8a6590ab5ee93cf646e4f41fb71d424961ecbf9bc13c68abdf539c63ab0c59a4d3b22195ba21859523f4cf0e937648424532794a1350a5891061096503" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/libxxf86vm b/source-recipes/libxxf86vm index 0d39ceb4..a82fa43a 100644 --- a/source-recipes/libxxf86vm +++ b/source-recipes/libxxf86vm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libXxf86vm-${version}.tar.xz" tarball_sha512="68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/limine b/source-recipes/limine index 0a98cc84..c6924bd8 100644 --- a/source-recipes/limine +++ b/source-recipes/limine @@ -5,6 +5,6 @@ tarball_url="https://github.com/limine-bootloader/limine/releases/download/v${ve tarball_sha512="28110a666932197c01a7c8628ad8ff532695e56d4ed7047755601ede737b256f64e6978a2627d2a90c14fea9a545302e60bf7d9a2eac897e57f7dd7aa8133dbe" hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/links b/source-recipes/links index d2015bb8..7065b5d8 100644 --- a/source-recipes/links +++ b/source-recipes/links @@ -5,7 +5,7 @@ tarball_url="http://links.twibright.com/download/links-${version}.tar.gz" tarball_sha512=8ebcc63b5f2c70039079f7aa7d35382a3ae692453561af534d8d44db51d73a9f9cb1e55fc71db26a8aa7da4bb0cea9cae3620fc18210c6b5e7410f7a532f27a1 #hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { #autoreconf -fvi true } diff --git a/source-recipes/linux b/source-recipes/linux index e5e5ed04..d95f4ab2 100644 --- a/source-recipes/linux +++ b/source-recipes/linux @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${version}.tar.xz" tarball_sha512="9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f" -regenerate() { +prepare() { true } diff --git a/source-recipes/llvm b/source-recipes/llvm index 8843433e..de4691fc 100644 --- a/source-recipes/llvm +++ b/source-recipes/llvm @@ -3,6 +3,6 @@ version=18.1.7 source_method=tarball tarball_url="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz" tarball_sha512="0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8" -regenerate() { +prepare() { true } diff --git a/source-recipes/make b/source-recipes/make index 66be3c7a..df70d6ab 100644 --- a/source-recipes/make +++ b/source-recipes/make @@ -3,6 +3,6 @@ version=4.4 source_method=tarball tarball_url="https://mirror.fcix.net/gnu/make/make-${version}.tar.gz" tarball_sha512="4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f" -regenerate() { +prepare() { true } diff --git a/source-recipes/make-ca b/source-recipes/make-ca index c574e2e4..3d852edd 100644 --- a/source-recipes/make-ca +++ b/source-recipes/make-ca @@ -3,6 +3,6 @@ version=1.13 source_method=tarball tarball_url="https://github.com/lfs-book/make-ca/releases/download/v${version}/make-ca-${version}.tar.xz" tarball_sha512=c961aec436ad2e88d462e77498640e1b55e9ed90fbe5964bbf44ab55bab511da4f3147bcd40fdac5a362db68414ba5a2f3709d1bdfdf2eb185aa0673986973ab -regenerate() { +prepare() { true } diff --git a/source-recipes/mesa b/source-recipes/mesa index cf3fcb60..eda649f3 100644 --- a/source-recipes/mesa +++ b/source-recipes/mesa @@ -3,6 +3,6 @@ version=24.2.0 source_method=tarball tarball_url="https://archive.mesa3d.org/mesa-${version}.tar.xz" tarball_sha512="a585c788801b5a341d356e44d958b148e6e14f6b3d7224e99a92faa2f004bf0cfc90103c5fdc651afb22f805c6f9dc594f9f3f5ecebcea36f6305b3a6ccb9294" -regenerate() { +prepare() { true } diff --git a/source-recipes/mesa-demos b/source-recipes/mesa-demos index 82cebb2d..37bf489b 100644 --- a/source-recipes/mesa-demos +++ b/source-recipes/mesa-demos @@ -3,6 +3,6 @@ version=9.0.0 source_method=tarball tarball_url="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz" tarball_sha512="af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1" -regenerate() { +prepare() { true } diff --git a/source-recipes/mkfontscale b/source-recipes/mkfontscale index 9fe72363..83f1d02c 100644 --- a/source-recipes/mkfontscale +++ b/source-recipes/mkfontscale @@ -5,6 +5,6 @@ tarball_url="https://www.x.org/pub/individual/app/mkfontscale-${version}.tar.xz" tarball_sha512="816e7b2885bb7a4b2eb0e506b659600011bfa4ec1a3010243c2cc2241fa0b792f3c8de1dec1855a4d13de89405973967074e379b0d01dcf9de8a1277a2fc4296" hostdeps="automake autoconf libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/mlibc b/source-recipes/mlibc index 1985af97..f5363b60 100644 --- a/source-recipes/mlibc +++ b/source-recipes/mlibc @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz" tarball_sha512="df6fccb461ca84f4628568f0555e3f09f3234ea39766df3c09f39e0e9f3277356473d3cd9d67f09e9aacc69e607f3e0db63331321bb83a375e20ab3b37c61451" -regenerate() { +prepare() { true } diff --git a/source-recipes/mount b/source-recipes/mount index 6883a081..f654b230 100644 --- a/source-recipes/mount +++ b/source-recipes/mount @@ -2,6 +2,6 @@ name=mount version=0 source_dir="tools/mount" -regenerate() { +prepare() { true } diff --git a/source-recipes/mpc b/source-recipes/mpc index 60618cb2..d183cdc1 100644 --- a/source-recipes/mpc +++ b/source-recipes/mpc @@ -5,6 +5,6 @@ tarball_url="https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz" tarball_sha512=3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/mpfr b/source-recipes/mpfr index 58401aab..48f85c0c 100644 --- a/source-recipes/mpfr +++ b/source-recipes/mpfr @@ -5,6 +5,6 @@ tarball_url="https://www.mpfr.org/mpfr-4.1.0/mpfr-${version}.tar.xz" tarball_sha512=1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 hostdeps="autoconf automake libtool pkgconfig autoconf-archive" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/nano b/source-recipes/nano index 8f4ed57e..d2e62040 100644 --- a/source-recipes/nano +++ b/source-recipes/nano @@ -5,6 +5,6 @@ tarball_url="https://ftp.gnu.org/gnu/nano/nano-${version}.tar.gz" tarball_sha512=340317fa2e068c5b10ea40c30298e972b406c5b81a987ec0a1fea73a516a09b02b6dcf96ed503236710a04889860369de5c462d555aaa9dbba9ff3a3735fde35 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { autoreconf -vfi } diff --git a/source-recipes/nasm b/source-recipes/nasm index 6ef90658..8b4ba9b1 100644 --- a/source-recipes/nasm +++ b/source-recipes/nasm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz" tarball_sha512=512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7 -regenerate() { +prepare() { true } diff --git a/source-recipes/ncurses b/source-recipes/ncurses index b1ed1ee8..dacae917 100644 --- a/source-recipes/ncurses +++ b/source-recipes/ncurses @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/ncurses/ncurses-${version}.tar.gz" tarball_sha512=5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 -regenerate() { +prepare() { true } diff --git a/source-recipes/neofetch b/source-recipes/neofetch index 69ca45f3..4ef56339 100644 --- a/source-recipes/neofetch +++ b/source-recipes/neofetch @@ -3,6 +3,6 @@ version=7.1.0 source_method=tarball tarball_url="https://github.com/dylanaraps/neofetch/archive/refs/tags/${version}.tar.gz" tarball_sha512=fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042 -regenerate() { +prepare() { true } diff --git a/source-recipes/netd b/source-recipes/netd index 6457ff75..e66e4cf2 100644 --- a/source-recipes/netd +++ b/source-recipes/netd @@ -2,6 +2,6 @@ name=mount version=0 source_dir="tools/netd" -regenerate() { +prepare() { true } diff --git a/source-recipes/nyancat b/source-recipes/nyancat index e4e2c49b..30935c8c 100644 --- a/source-recipes/nyancat +++ b/source-recipes/nyancat @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/klange/nyancat/archive/refs/tags/${version}.tar.gz" tarball_sha512=882bdcfe702d4613484b293f767a2ed74da63f222071e59f56a4246f56947882540930bcb2deae22f6e3326064f1c6f0ff7eb78ac6d7aa08125ebe64ebdf16eb -regenerate() { +prepare() { true } diff --git a/source-recipes/openssh b/source-recipes/openssh index b2fa1655..00d397cb 100644 --- a/source-recipes/openssh +++ b/source-recipes/openssh @@ -4,7 +4,7 @@ source_method=tarball tarball_url="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz" tarball_sha512="0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi cp -v $(find /usr/local/share/automake* -name config.sub) . } diff --git a/source-recipes/openssl b/source-recipes/openssl index 8bc4faaa..6dd7d34e 100644 --- a/source-recipes/openssl +++ b/source-recipes/openssl @@ -3,6 +3,6 @@ version=1.1.1q source_method=tarball tarball_url="https://www.openssl.org/source/openssl-${version}.tar.gz" tarball_sha512="cb9f184ec4974a3423ef59c8ec86b6bf523d5b887da2087ae58c217249da3246896fdd6966ee9c13aea9e6306783365239197e9f742c508a0e35e5744e3e085f" -regenerate() { +prepare() { true } diff --git a/source-recipes/oss b/source-recipes/oss index 190af845..1a36649f 100644 --- a/source-recipes/oss +++ b/source-recipes/oss @@ -4,7 +4,7 @@ source_method=tarball tarball_url="http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2020-src-gpl.tar.bz2" tarball_sha512=6b0c5390e92f9c9466669600321140b54d1fde5eeaef2f9938d6bdbc7ae686f4a1ad0fa9669a1505962eb515d61d29d8a677911557a9b245ce039e1ab3b77d69 -regenerate() { +prepare() { true #touch ${source_dir}/cmd/ossdevlinks/.nomake } diff --git a/source-recipes/pcre2 b/source-recipes/pcre2 index 324599c1..9ea46be7 100644 --- a/source-recipes/pcre2 +++ b/source-recipes/pcre2 @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2" tarball_sha512="72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/pixman b/source-recipes/pixman index 88da8fa1..5954bf15 100644 --- a/source-recipes/pixman +++ b/source-recipes/pixman @@ -3,6 +3,6 @@ version=0.40.0 source_method=tarball tarball_url="https://www.cairographics.org/releases/pixman-${version}.tar.gz" tarball_sha512="063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f" -regenerate() { +prepare() { true } diff --git a/source-recipes/pkgconfig b/source-recipes/pkgconfig index 1dee3802..566a275d 100644 --- a/source-recipes/pkgconfig +++ b/source-recipes/pkgconfig @@ -3,8 +3,8 @@ version=1.8.0 source_method=tarball tarball_url="https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-${version}.tar.gz" tarball_sha512="6b0ce203e85dc671503ad4bebdfdddc567916a8cdd77f739350db99e1e01c098ea2e3111309d2beeff2eff5389f328372ec327eb590f7b3a120b2452ed24021d" -imagedeps="autoconf automake" +imagedeps="autoconf automake libtool" -regenerate() { +prepare() { ./autogen.sh } diff --git a/source-recipes/python b/source-recipes/python index fa851739..725ed88d 100644 --- a/source-recipes/python +++ b/source-recipes/python @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" tarball_sha512=5ea018e71bfe7872e02eaf8aef56d5583c0880e4ce5fbbdf8ea76da20c2e94ac6a3ba8badb4b7d1bc21853402a3b63541b04181737417b1626e786b696595cf5 hostdeps="autoconf automake pkgconfig libtool autoconf-archive" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/qemu b/source-recipes/qemu index 6c10b5c6..fab869b5 100644 --- a/source-recipes/qemu +++ b/source-recipes/qemu @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://download.qemu.org/qemu-${version}.tar.xz" tarball_sha512="bf61d65e37945fa8ee8640712c719ace05164d86e6df700b98bdc5f79e0a8d5e8f85bd48e726edb62b2419db20673f63ec8b63a60393a914b09cb365621b35e2" -regenerate() { +prepare() { true } diff --git a/source-recipes/readline b/source-recipes/readline index 059eef75..3a5b1bfa 100644 --- a/source-recipes/readline +++ b/source-recipes/readline @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/readline/readline-${version}.tar.gz" tarball_sha512=0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a -regenerate() { +prepare() { true } diff --git a/source-recipes/sdl2 b/source-recipes/sdl2 index ac952c38..cade8921 100644 --- a/source-recipes/sdl2 +++ b/source-recipes/sdl2 @@ -3,6 +3,6 @@ version=2.30.2 source_method=tarball tarball_url="https://github.com/libsdl-org/SDL/archive/refs/tags/release-${version}.tar.gz" tarball_sha512="915f28c8406df36e6440b7d690c193076c3f886ad1b18c871c70869fe08dbe48d4ec5d2541d36d1b97ab26e1299fef2e3048e641e76ab4b63c687273968b0e5e" -regenerate() { +prepare() { true } diff --git a/source-recipes/sed b/source-recipes/sed index 86b8ff74..f9f45aa9 100644 --- a/source-recipes/sed +++ b/source-recipes/sed @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/sed/sed-${version}.tar.xz" tarball_sha512="36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/shadow b/source-recipes/shadow index 66c99665..68aaf154 100644 --- a/source-recipes/shadow +++ b/source-recipes/shadow @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/shadow-maint/shadow/releases/download/${version}/shadow-${version}.tar.xz" tarball_sha512="e3ae51bf53bfa1662d81bbe0150ada19c116514f1e56391d877045d48e16776326446561759edbf5006c0f97ab1d5f4bae63521bf1fae67e118ddda0d4a8f6cb" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/sudo b/source-recipes/sudo index 9ed6dd2e..b6afd101 100644 --- a/source-recipes/sudo +++ b/source-recipes/sudo @@ -4,7 +4,7 @@ source_method=tarball tarball_url="https://github.com/sudo-project/sudo/releases/download/SUDO_1_9_15p5/sudo-1.9.15p5.tar.gz" tarball_sha512="ebac69719de2fe7bd587924701bdd24149bf376a68b17ec02f69b2b96d4bb6fa5eb8260a073ec5ea046d3ac69bb5b1c0b9d61709fe6a56f1f66e40817a70b15a" hostdeps="autoconf automake pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi cp -v $(find /usr/local/share/automake* -name config.sub) scripts } diff --git a/source-recipes/tar b/source-recipes/tar index 7d2481b7..4d0b5b8d 100644 --- a/source-recipes/tar +++ b/source-recipes/tar @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/tar/tar-${version}.tar.gz" tarball_sha512=38dca8fbc193859770902c31aa6a6cf7a8fcd28687792b5aa8ba938bf39ce1e25c1b0de05f2a982b7b371eeb13502eb67cd27428ae1ade439bd6771aa9d05271 -regenerate() { +prepare() { true } diff --git a/source-recipes/twm b/source-recipes/twm index b1196679..489eab62 100644 --- a/source-recipes/twm +++ b/source-recipes/twm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/twm-${version}.tar.xz" tarball_sha512="f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/tyrquake b/source-recipes/tyrquake index b34df1f2..66de8063 100644 --- a/source-recipes/tyrquake +++ b/source-recipes/tyrquake @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://disenchant.net/files/engine/tyrquake-${version}.tar.gz" tarball_sha512=ecceeecb43866c10c0669b4362ce2eda7a790c502764b3d644566e7637ffbde0548676c9dcea07963db0d91d83c248e3497603c0a3a2e1a12a1418a82c07179a -regenerate() { +prepare() { true } diff --git a/source-recipes/util-macros b/source-recipes/util-macros index 637cff28..a66c035d 100644 --- a/source-recipes/util-macros +++ b/source-recipes/util-macros @@ -3,6 +3,6 @@ version=1.20.0 source_method=tarball tarball_url="https://www.x.org/pub/individual/util/util-macros-${version}.tar.xz" tarball_sha512="76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb" -regenerate() { +prepare() { true } diff --git a/source-recipes/vim b/source-recipes/vim index 094f47ee..f03f720d 100644 --- a/source-recipes/vim +++ b/source-recipes/vim @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/vim/vim/archive/refs/tags/v${version}.tar.gz" tarball_sha512=89e2e142d2dcbd162efd3f552ac745c2f2aaa905c08f8ffb88122feb53c9150a8906cfbfbba6203c186d7651276c8582ffc39c0b54f5bbf81e9a32546e7b1715 -regenerate() { +prepare() { true } diff --git a/source-recipes/wget b/source-recipes/wget index 78114479..e4e75d2d 100644 --- a/source-recipes/wget +++ b/source-recipes/wget @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://ftp.gnu.org/gnu/wget/wget-${version}.tar.gz" tarball_sha512="572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d" hostdeps="autoconf automake pkgconfig libtool autoconf-archive" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xauth b/source-recipes/xauth index 95fd9147..ef3c6bab 100644 --- a/source-recipes/xauth +++ b/source-recipes/xauth @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/releases/individual/app/xauth-${version}.tar.xz" tarball_sha512="536434f6c607673c00b9658ea591bf32419cc151d138f991ea38167220563519a6a84a5504003da15820f2a7ed50ea2449c6ce9c991d1446ee9a7305c647d694" hostdeps="automake" -regenerate() { +prepare() { cp -v $(find /usr/local/share/automake* -name config.sub) . } diff --git a/source-recipes/xbitmaps b/source-recipes/xbitmaps index 4469a092..edb9a818 100644 --- a/source-recipes/xbitmaps +++ b/source-recipes/xbitmaps @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/data/xbitmaps-${version}.tar.bz2" tarball_sha512="eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xcb-proto b/source-recipes/xcb-proto index ea99a165..2ea3aaa6 100644 --- a/source-recipes/xcb-proto +++ b/source-recipes/xcb-proto @@ -3,6 +3,6 @@ version=1.15.2 source_method=tarball tarball_url="https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-${version}.tar.xz" tarball_sha512="9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d" -regenerate() { +prepare() { true } diff --git a/source-recipes/xclock b/source-recipes/xclock index ee6fd97d..0f28bff0 100644 --- a/source-recipes/xclock +++ b/source-recipes/xclock @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/xclock-${version}.tar.xz" tarball_sha512="059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xedit b/source-recipes/xedit index 60d7d444..6416e006 100644 --- a/source-recipes/xedit +++ b/source-recipes/xedit @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/xedit-${version}.tar.xz" tarball_sha512="1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xev b/source-recipes/xev index 4981e710..cf53195f 100644 --- a/source-recipes/xev +++ b/source-recipes/xev @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/xev-${version}.tar.xz" tarball_sha512="9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xeyes b/source-recipes/xeyes index 2092e342..99492ff7 100644 --- a/source-recipes/xeyes +++ b/source-recipes/xeyes @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/xeyes-${version}.tar.gz" tarball_sha512="95461702cf27615bb7d4eb09b84f9589b810fa905a913b11050b32ce4004a4926e1521b3506a1bf378cb42b0bd6d8735871b6be2382824e2706f4ca24356db45" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xf86-input-keyboard b/source-recipes/xf86-input-keyboard index f52a2c42..08328879 100644 --- a/source-recipes/xf86-input-keyboard +++ b/source-recipes/xf86-input-keyboard @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://xorg.freedesktop.org/archive/individual/driver/xf86-input-keyboard-${version}.tar.gz" tarball_sha512=2243d6b93315c0fdd97e57f62f86fcb26117a512817bfee0a5af76f686d5f8a5c8ea7b3f4e543e2d8ffc8d52129b6b575b9dc2a59e42fa8b23d8ba223544715a hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xf86-input-mouse b/source-recipes/xf86-input-mouse index 16183d1b..5511692f 100644 --- a/source-recipes/xf86-input-mouse +++ b/source-recipes/xf86-input-mouse @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://xorg.freedesktop.org/archive/individual/driver/xf86-input-mouse-${version}.tar.gz" tarball_sha512=31c23fa6fe7f77707b6eeb61e8d928b0fe8ffb49c3a5ddda36e36d48d20618c438580c573c5d9e40bc32d28612dd60886b3fff983aafd90b20a198b14c228587 hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xf86-video-fbdev b/source-recipes/xf86-video-fbdev index b97a43ec..baaf66ad 100644 --- a/source-recipes/xf86-video-fbdev +++ b/source-recipes/xf86-video-fbdev @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/driver/xf86-video-fbdev-${version}.tar.bz2" tarball_sha512="c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xfishtank b/source-recipes/xfishtank index c5e7480e..b09095dc 100644 --- a/source-recipes/xfishtank +++ b/source-recipes/xfishtank @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://github.com/sydneyjd/xfishtank/archive/63022c8877710cefa7e4815dda8bd6ae50557fb5.tar.gz" tarball_sha512=1ef1e0b89cc3fbe3d9a246509dac158d1663d784e302be7e3e28baf52205a11d83a5a0b4170ccef1e8befb49e013177a7480b2ae0e87953129b19d75723d0b81 -regenerate() { +prepare() { true } diff --git a/source-recipes/xfontalias b/source-recipes/xfontalias index 6f42e1e7..9c74cb01 100644 --- a/source-recipes/xfontalias +++ b/source-recipes/xfontalias @@ -5,6 +5,6 @@ tarball_url="https://www.x.org/pub/individual/font/font-alias-${version}.tar.xz" tarball_sha512="86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc" hostdeps="automake autoconf libtool pkgconfig util-macros fontutil" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xfontmiscethipic b/source-recipes/xfontmiscethipic index 83bd3805..b164e65a 100644 --- a/source-recipes/xfontmiscethipic +++ b/source-recipes/xfontmiscethipic @@ -5,6 +5,6 @@ tarball_url="https://www.x.org/pub/individual/font/font-misc-ethiopic-${version} tarball_sha512="7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0" hostdeps="automake autoconf libtool pkgconfig util-macros fontutil" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xfontmiscmisc b/source-recipes/xfontmiscmisc index 9453ec56..cab585f8 100644 --- a/source-recipes/xfontmiscmisc +++ b/source-recipes/xfontmiscmisc @@ -5,6 +5,6 @@ tarball_url="https://www.x.org/archive//individual/font/font-misc-misc-${version tarball_sha512="fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48" hostdeps="automake autoconf libtool pkgconfig util-macros fontutil" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xkbcomp b/source-recipes/xkbcomp index e71bb5d7..8bc73e18 100644 --- a/source-recipes/xkbcomp +++ b/source-recipes/xkbcomp @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive//individual/app/xkbcomp-${version}.tar.gz" tarball_sha512="c80a854779aa2c6ab79953870fbf712eb866e427643803bdecc129932b07f10c90482dfda178719808547d65aedfec44fca0ee3c271625bd77edf995fafaf4a0" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xkbfile b/source-recipes/xkbfile index f79fb1ab..4136a03f 100644 --- a/source-recipes/xkbfile +++ b/source-recipes/xkbfile @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/libxkbfile-${version}.tar.gz" tarball_sha512="8dc3894d306666c8222e00aae62989b77bbe194f058a85dc162127d652d772181426da617c97018ebc530eba070fe4a42c2048b314db2485b62774af1741d4de" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -vif } diff --git a/source-recipes/xkeyboardconfig b/source-recipes/xkeyboardconfig index 97e8cf5b..eca3cf28 100644 --- a/source-recipes/xkeyboardconfig +++ b/source-recipes/xkeyboardconfig @@ -4,7 +4,7 @@ source_method=tarball tarball_url="http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-${version}.tar.xz" tarball_sha512="a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { pushd ${source_dir} sed -i -E "s/(ln -s)/\1f/" rules/meson.build popd diff --git a/source-recipes/xneko b/source-recipes/xneko index 2c273677..bc37b4ac 100644 --- a/source-recipes/xneko +++ b/source-recipes/xneko @@ -3,6 +3,6 @@ version=1.4 source_method=tarball tarball_url="https://astral-os.org/mirror/xneko.tar.gz" tarball_sha512=7e2429f8a66ecfe342e3df907ccd6b4f5378a3441ec05aaf4cbb3cae67e95ea1ac4427abad400704f489619d0dd107ae5b58dc8bdba09a4a05d8332c33a06a6f -regenerate() { +prepare() { true } diff --git a/source-recipes/xorg-server b/source-recipes/xorg-server index 74828b8c..12887651 100644 --- a/source-recipes/xorg-server +++ b/source-recipes/xorg-server @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/xserver/xorg-server-${version}.tar.xz" tarball_sha512="eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f" hostdeps="autoconf automake pkgconfig libtool util-macros fontutil xtrans" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xorgproto b/source-recipes/xorgproto index c30860d6..fb282e1d 100644 --- a/source-recipes/xorgproto +++ b/source-recipes/xorgproto @@ -3,6 +3,6 @@ version=2022.2 source_method=tarball tarball_url="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.2.tar.xz" tarball_sha512="8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9" -regenerate() { +prepare() { true } diff --git a/source-recipes/xrandr b/source-recipes/xrandr index 7a678aee..3564cc74 100644 --- a/source-recipes/xrandr +++ b/source-recipes/xrandr @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/pub/individual/app/xrandr-${version}.tar.xz" tarball_sha512="3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xscreensaver b/source-recipes/xscreensaver index 6f248065..60b86b12 100644 --- a/source-recipes/xscreensaver +++ b/source-recipes/xscreensaver @@ -4,7 +4,7 @@ source_method=tarball tarball_url="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz" tarball_sha512="6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi cp -v $(find /usr/local/share/automake* -name config.sub) . } diff --git a/source-recipes/xsetroot b/source-recipes/xsetroot index 9a1600a9..ec2da2f7 100644 --- a/source-recipes/xsetroot +++ b/source-recipes/xsetroot @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/app/xsetroot-${version}.tar.gz" tarball_sha512="e6ff6d5e53f14f965d2923289bd4a4fd77e7d254c8ea68a6c53c1404f9c7b31ac810cd213926820b280b04ae2e0ec66a7a3b7e98ea4a37d0e22755a7ed0693c3" hostdeps="autoconf automake util-macros pkgconfig libtool" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/xterm b/source-recipes/xterm index 3a6e6cba..654a8dc2 100644 --- a/source-recipes/xterm +++ b/source-recipes/xterm @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" tarball_sha512=865ae292a56635ec2811a950763da22cbbb4de463bee75b4595b7387a09227f612c5620986e431631c3d73fe783d862fd9a6694c54c33898327339467b7085b7 -regenerate() { +prepare() { true } diff --git a/source-recipes/xtrans b/source-recipes/xtrans index 67768393..615a64d6 100644 --- a/source-recipes/xtrans +++ b/source-recipes/xtrans @@ -4,6 +4,6 @@ source_method=tarball tarball_url="https://www.x.org/archive/individual/lib/xtrans-${version}.tar.gz" tarball_sha512="21287ccf18fe2ebd458765496b026d175bf47c6e8e5c21d5b9ea17203967efc0cf6928fa2f3385d289a680c7002c3640e4731937029e99933c2a64bb9fab5326" hostdeps="autoconf automake libtool pkgconfig util-macros" -regenerate() { +prepare() { autoreconf -fvi } diff --git a/source-recipes/zlib b/source-recipes/zlib index 368563bd..a35b5cbd 100644 --- a/source-recipes/zlib +++ b/source-recipes/zlib @@ -5,6 +5,6 @@ tarball_url="https://github.com/madler/zlib/releases/download/v${version}/zlib-$ tarball_sha512=3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2 hostdeps="autoconf automake libtool pkgconfig" -regenerate() { +prepare() { true }