From 5c628d36956ed48900c04bf73696e1e37a4eb1c1 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Mon, 23 Sep 2024 06:33:27 +0200 Subject: [PATCH] jinx: Upgrade to 0.4.0 --- GNUmakefile | 40 ++++--------------------------- build-support/makeiso.sh | 12 ++++++++-- host-recipes/autoconf | 4 +++- host-recipes/autoconf-2.69 | 4 +++- host-recipes/automake | 4 +++- host-recipes/binutils | 4 +++- host-recipes/gcc | 5 +++- host-recipes/libtool | 4 +++- host-recipes/limine | 4 +++- host-recipes/pkg-config | 4 +++- jinx-config | 2 +- recipes/ace-of-penguins | 6 +++-- recipes/at-spi2-core | 4 +++- recipes/base | 3 +++ recipes/bash | 6 +++-- recipes/binutils | 6 +++-- recipes/bzip2 | 2 +- recipes/cairo | 4 +++- recipes/cglm | 6 +++-- recipes/coreutils | 6 +++-- recipes/curl | 6 +++-- recipes/dbus | 6 +++-- recipes/diffutils | 6 +++-- recipes/findutils | 6 +++-- recipes/fontconfig | 6 +++-- recipes/freeglut | 4 +++- recipes/freetype2 | 6 +++-- recipes/fribidi | 6 +++-- recipes/frigg | 4 +++- recipes/gawk | 6 +++-- recipes/gcc | 6 +++-- recipes/gdbm | 6 +++-- recipes/gdk-pixbuf | 4 +++- recipes/gettext | 6 +++-- recipes/git | 6 +++-- recipes/glib | 4 +++- recipes/glu | 4 +++- recipes/gmp | 6 +++-- recipes/graphite2 | 4 +++- recipes/grep | 6 +++-- recipes/groff | 6 +++-- recipes/gsettings-desktop-schemas | 6 +++-- recipes/gtk+-3 | 4 +++- recipes/gzip | 6 +++-- recipes/harfbuzz | 8 ++++--- recipes/icu | 6 +++-- recipes/kernel | 2 +- recipes/less | 6 +++-- recipes/libarchive | 6 +++-- recipes/libepoxy | 4 +++- recipes/libexpat | 6 +++-- recipes/libffi | 6 +++-- recipes/libfontenc | 6 +++-- recipes/libgcrypt | 6 +++-- recipes/libgpg-error | 6 +++-- recipes/libice | 6 +++-- recipes/libiconv | 6 +++-- recipes/libintl | 4 +++- recipes/libjpeg-turbo | 4 +++- recipes/libpipeline | 6 +++-- recipes/libpng | 6 +++-- recipes/libsm | 6 +++-- recipes/libtiff | 6 +++-- recipes/libunistring | 6 +++-- recipes/libwebp | 6 +++-- recipes/libx11 | 6 +++-- recipes/libxau | 6 +++-- recipes/libxaw | 6 +++-- recipes/libxcb | 6 +++-- recipes/libxcrypt | 6 +++-- recipes/libxcursor | 6 +++-- recipes/libxcvt | 4 +++- recipes/libxdamage | 6 +++-- recipes/libxdmcp | 6 +++-- recipes/libxext | 6 +++-- recipes/libxfixes | 6 +++-- recipes/libxfont2 | 6 +++-- recipes/libxft | 6 +++-- recipes/libxi | 6 +++-- recipes/libxinerama | 6 +++-- recipes/libxkbcommon | 4 +++- recipes/libxkbfile | 6 +++-- recipes/libxml | 6 +++-- recipes/libxmu | 6 +++-- recipes/libxpm | 6 +++-- recipes/libxrandr | 6 +++-- recipes/libxrender | 6 +++-- recipes/libxshmfence | 6 +++-- recipes/libxt | 6 +++-- recipes/libxtst | 6 +++-- recipes/libxv | 6 +++-- recipes/libxxf86vm | 6 +++-- recipes/libzip | 4 +++- recipes/limine | 6 +++-- recipes/llvm | 4 +++- recipes/make | 6 +++-- recipes/man-db | 6 +++-- recipes/mesa | 4 +++- recipes/mesa-demos | 6 +++-- recipes/mlibc | 4 +++- recipes/mlibc-headers | 4 +++- recipes/mpc | 6 +++-- recipes/mpfr | 6 +++-- recipes/nano | 6 +++-- recipes/nasm | 6 +++-- recipes/ncurses | 6 +++-- recipes/nettle | 6 +++-- recipes/openssh | 6 +++-- recipes/openssl | 4 +++- recipes/pango | 4 +++- recipes/pcre2 | 6 +++-- recipes/pixman | 4 +++- recipes/python | 6 +++-- recipes/readline | 6 +++-- recipes/sdl2 | 4 +++- recipes/sed | 6 +++-- recipes/sqlite | 6 +++-- recipes/taisei | 4 +++- recipes/tar | 6 +++-- recipes/v | 2 +- recipes/xbitmaps | 6 +++-- recipes/xcb-proto | 6 +++-- recipes/xf86-input-keyboard | 6 +++-- recipes/xf86-input-mouse | 6 +++-- recipes/xf86-video-fbdev | 6 +++-- recipes/xkeyboard-config | 4 +++- recipes/xorg-font-util | 6 +++-- recipes/xorg-proto | 6 +++-- recipes/xorg-server | 6 +++-- recipes/xorg-twm | 6 +++-- recipes/xorg-util-macros | 6 +++-- recipes/xorg-xauth | 6 +++-- recipes/xorg-xclock | 6 +++-- recipes/xorg-xeyes | 6 +++-- recipes/xorg-xinit | 6 +++-- recipes/xorg-xkbcomp | 6 +++-- recipes/xorg-xkbutils | 6 +++-- recipes/xorg-xmodmap | 6 +++-- recipes/xorg-xrdb | 6 +++-- recipes/xorg-xsetroot | 6 +++-- recipes/xtrans | 6 +++-- recipes/xz | 6 +++-- recipes/zlib | 4 +++- source-recipes/gcc-host | 2 +- source-recipes/libtool | 2 +- source-recipes/pkg-config | 2 +- 146 files changed, 536 insertions(+), 284 deletions(-) create mode 100644 recipes/base diff --git a/GNUmakefile b/GNUmakefile index 4a0d5df2f..44ed86679 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -10,8 +10,6 @@ all: $(MAKE) vinix.iso vinix.iso: jinx - rm -f builds/kernel.built builds/kernel.packaged - $(MAKE) distro-base ./build-support/makeiso.sh .PHONY: debug @@ -19,17 +17,9 @@ debug: JINX_CONFIG_FILE=jinx-config-debug $(MAKE) all jinx: - curl -Lo jinx https://github.com/mintsuki/jinx/raw/35af34f2d105bf27478112706de08bd98c316be7/jinx + curl -Lo jinx https://github.com/mintsuki/jinx/raw/31bafe0d84332bf20388420f3c16879e63314cfe/jinx chmod +x jinx -.PHONY: distro-full -distro-full: jinx - ./jinx build-all - -.PHONY: distro-base -distro-base: jinx - ./jinx build base-files kernel init bash binutils bzip2 coreutils diffutils findutils gawk gcc gmp grep gzip less make mpc mpfr nano ncurses pcre2 readline sed tar tzdata util-vinix xz zlib zstd - .PHONY: run-kvm run-kvm: vinix.iso qemu-system-x86_64 -enable-kvm -cpu host $(QEMUFLAGS) @@ -67,33 +57,11 @@ run-lingemu: vinix.iso run: vinix.iso qemu-system-x86_64 $(QEMUFLAGS) -.PHONY: kernel-clean -kernel-clean: - make -C kernel clean - rm -rf builds/kernel* pkgs/kernel* - -.PHONY: util-vinix-clean -util-vinix-clean: - make -C util-vinix clean - rm -rf builds/util-vinix* pkgs/util-vinix* - -.PHONY: init-clean -init-clean: - rm -rf init/init - rm -rf builds/init* pkgs/init* - -.PHONY: base-files-clean -base-files-clean: - rm -rf builds/base-files* pkgs/base-files* - .PHONY: clean -clean: kernel-clean util-vinix-clean init-clean base-files-clean +clean: rm -rf iso_root sysroot vinix.iso initramfs.tar .PHONY: distclean -distclean: jinx +distclean: clean make -C kernel distclean - ./jinx clean - rm -rf iso_root sysroot vinix.iso initramfs.tar jinx ovmf - chmod -R 777 .jinx-cache - rm -rf .jinx-cache + rm -rf .jinx-cache jinx builds host-builds host-pkgs pkgs sources ovmf diff --git a/build-support/makeiso.sh b/build-support/makeiso.sh index 4268fb157..f33962e30 100755 --- a/build-support/makeiso.sh +++ b/build-support/makeiso.sh @@ -2,10 +2,18 @@ set -ex +if [ -z "$PKGS_TO_INSTALL" ]; then + PKGS_TO_INSTALL=base +fi + # Build the sysroot with jinx and build limine. rm -rf sysroot -./jinx sysroot -./jinx host-build limine +set -f +./jinx install "sysroot" $PKGS_TO_INSTALL +set +f +if ! [ -d host-pkgs/limine ]; then + ./jinx host-build limine +fi # Make an initramfs with the sysroot. ( cd sysroot && tar cf ../initramfs.tar * ) diff --git a/host-recipes/autoconf b/host-recipes/autoconf index b4cb2bedf..907988f58 100644 --- a/host-recipes/autoconf +++ b/host-recipes/autoconf @@ -2,12 +2,14 @@ name=autoconf from_source=autoconf revision=1 -build() { +configure() { CFLAGS="$HOST_CFLAGS" \ CXXFLAGS="$HOST_CXXFLAGS" \ LDFLAGS="$HOST_LDFLAGS" \ "${source_dir}"/configure --prefix="${prefix}" +} +build() { make -j${parallelism} } diff --git a/host-recipes/autoconf-2.69 b/host-recipes/autoconf-2.69 index ad032f7fb..179e7a73f 100644 --- a/host-recipes/autoconf-2.69 +++ b/host-recipes/autoconf-2.69 @@ -2,12 +2,14 @@ name=autoconf-2.69 from_source=autoconf-2.69 revision=1 -build() { +configure() { CFLAGS="$HOST_CFLAGS" \ CXXFLAGS="$HOST_CXXFLAGS" \ LDFLAGS="$HOST_LDFLAGS" \ "${source_dir}"/configure --prefix="${prefix}" +} +build() { make -j${parallelism} } diff --git a/host-recipes/automake b/host-recipes/automake index c3e4b661b..6795b196f 100644 --- a/host-recipes/automake +++ b/host-recipes/automake @@ -4,12 +4,14 @@ revision=1 hostdeps="autoconf" imagedeps="build-essential" -build() { +configure() { CFLAGS="$HOST_CFLAGS" \ CXXFLAGS="$HOST_CXXFLAGS" \ LDFLAGS="$HOST_LDFLAGS" \ "${source_dir}"/configure --prefix="${prefix}" +} +build() { make -j${parallelism} } diff --git a/host-recipes/binutils b/host-recipes/binutils index 1e5de617a..e26c4e540 100644 --- a/host-recipes/binutils +++ b/host-recipes/binutils @@ -4,7 +4,7 @@ revision=1 imagedeps="build-essential" hostdeps="autoconf-2.69 automake libtool pkg-config" -build() { +configure() { CFLAGS="$HOST_CFLAGS" \ CXXFLAGS="$HOST_CXXFLAGS" \ LDFLAGS="$HOST_LDFLAGS" \ @@ -25,7 +25,9 @@ build() { --disable-nls \ --disable-werror \ --with-pic +} +build() { make -j${parallelism} } diff --git a/host-recipes/gcc b/host-recipes/gcc index 9aeb405ae..5814e12e1 100644 --- a/host-recipes/gcc +++ b/host-recipes/gcc @@ -6,7 +6,7 @@ hostdeps="autoconf-2.69 automake libtool pkg-config" hostrundeps="binutils" deps="mlibc-headers" -build() { +configure() { cp -rp "${source_dir}"/. ./ mkdir -p build && cd build @@ -29,7 +29,10 @@ build() { --enable-initfini-array \ --enable-shared \ --enable-host-shared +} +build() { + cd build make -j${parallelism} all-gcc } diff --git a/host-recipes/libtool b/host-recipes/libtool index 72d8f2b69..31cc7e649 100644 --- a/host-recipes/libtool +++ b/host-recipes/libtool @@ -4,7 +4,7 @@ revision=1 hostdeps="autoconf automake" imagedeps="help2man build-essential" -build() { +configure() { cp -rp "${source_dir}"/. ./ CFLAGS="$HOST_CFLAGS" \ @@ -12,7 +12,9 @@ build() { LDFLAGS="$HOST_LDFLAGS" \ ./configure \ --prefix="${prefix}" +} +build() { make -j${parallelism} } diff --git a/host-recipes/limine b/host-recipes/limine index 011991a11..df19d25ef 100644 --- a/host-recipes/limine +++ b/host-recipes/limine @@ -4,7 +4,7 @@ revision=1 hostdeps="gcc autoconf automake libtool pkg-config" imagedeps="nasm build-essential mtools" -build() { +configure() { if [ "$ARCHITECTURE" = "x86_64" ]; then X86_FLAGS="--enable-bios \ --enable-bios-cd \ @@ -22,7 +22,9 @@ build() { $X86_FLAGS \ --enable-uefi-$ARCHITECTURE \ --enable-uefi-cd +} +build() { LDFLAGS="$LDFLAGS -static" \ make -j${parallelism} } diff --git a/host-recipes/pkg-config b/host-recipes/pkg-config index 90a568355..ccae962b5 100644 --- a/host-recipes/pkg-config +++ b/host-recipes/pkg-config @@ -4,13 +4,15 @@ revision=1 imagedeps="build-essential" hostdeps="automake autoconf libtool" -build() { +configure() { CFLAGS="$HOST_CFLAGS" \ CXXFLAGS="$HOST_CXXFLAGS" \ LDFLAGS="$HOST_LDFLAGS" \ "${source_dir}"/configure \ --prefix="${prefix}" +} +build() { make -j${parallelism} } diff --git a/jinx-config b/jinx-config index a1a04e991..89cad5fd6 100644 --- a/jinx-config +++ b/jinx-config @@ -1,4 +1,4 @@ -JINX_MAJOR_VER=0.3 +JINX_MAJOR_VER=0.4 HOST_CFLAGS="-O2 -pipe -fstack-clash-protection" HOST_CXXFLAGS="${HOST_CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS" diff --git a/recipes/ace-of-penguins b/recipes/ace-of-penguins index c78feaa9b..94e6d5d15 100644 --- a/recipes/ace-of-penguins +++ b/recipes/ace-of-penguins @@ -9,16 +9,18 @@ imagedeps="build-essential libpng-dev" hostdeps="gcc autoconf automake pkg-config libtool" deps="core-libs libx11 libxpm libpng zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ BUILD_CFLAGS="$HOST_CFLAGS" \ BUILD_CPPFLAGS="$HOST_CPPFLAGS" \ BUILD_LDFLAGS="$HOST_LDFLAGS" +} +build() { make -j${parallelism} } diff --git a/recipes/at-spi2-core b/recipes/at-spi2-core index 2baeeb2d3..14eca6649 100644 --- a/recipes/at-spi2-core +++ b/recipes/at-spi2-core @@ -7,11 +7,13 @@ imagedeps="meson ninja-build libglib2.0-dev" hostdeps="gcc pkg-config" deps="core-libs bash dbus glib gsettings-desktop-schemas libx11 libxi libxkbcommon libxml libxtst" -build() { +configure() { meson_configure \ -Dsystemd_user_dir=/tmp \ -Dintrospection=disabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/base b/recipes/base new file mode 100644 index 000000000..5b4e4dcab --- /dev/null +++ b/recipes/base @@ -0,0 +1,3 @@ +name=base +revision=1 +deps="base-files kernel init bash binutils bzip2 coreutils diffutils findutils gawk gcc gmp grep gzip less make mpc mpfr nano ncurses pcre2 readline sed tar tzdata util-vinix xz zlib zstd" diff --git a/recipes/bash b/recipes/bash index b0f0f0952..0706443c8 100644 --- a/recipes/bash +++ b/recipes/bash @@ -10,7 +10,7 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs ncurses readline" -regenerate() { +prepare() { curl -Lo bash52-022 https://ftp.gnu.org/gnu/bash/bash-5.2-patches/bash52-022 curl -Lo bash52-023 https://ftp.gnu.org/gnu/bash/bash-5.2-patches/bash52-023 curl -Lo bash52-024 https://ftp.gnu.org/gnu/bash/bash-5.2-patches/bash52-024 @@ -25,7 +25,7 @@ regenerate() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ CFLAGS="$TARGET_CFLAGS \ -DDEFAULT_PATH_VALUE='\"/usr/local/sbin:/usr/local/bin:/usr/bin\"' \ @@ -38,7 +38,9 @@ build() { --enable-readline \ --without-bash-malloc \ --with-installed-readline="${sysroot}/usr/lib" +} +build() { make -j${parallelism} } diff --git a/recipes/binutils b/recipes/binutils index b6b50865a..11aa2a783 100644 --- a/recipes/binutils +++ b/recipes/binutils @@ -8,13 +8,13 @@ imagedeps="build-essential" hostdeps="gcc autoconf-2.69 automake libtool pkg-config" deps="core-libs zlib zstd" -regenerate() { +prepare() { autotools_recursive_regen -I"$(realpath ./config)" cp -pv /usr/local/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/ } -build() { +configure() { autotools_configure \ --target=${OS_TRIPLET} \ --with-build-sysroot=${sysroot_dir} \ @@ -32,7 +32,9 @@ build() { --disable-werror \ --with-pic \ --with-system-zlib +} +build() { make -j${parallelism} } diff --git a/recipes/bzip2 b/recipes/bzip2 index dd0f0224a..951709878 100644 --- a/recipes/bzip2 +++ b/recipes/bzip2 @@ -7,7 +7,7 @@ hostdeps="gcc pkg-config" deps="core-libs" build() { - cp -r ${source_dir}/. . + cp -rp ${source_dir}/. . make -f Makefile-libbz2_so CC="${OS_TRIPLET}-gcc $TARGET_CFLAGS $TARGET_CPPFLAGS $TARGET_LDFLAGS" make bzip2 bzip2recover CC="${OS_TRIPLET}-gcc $TARGET_CFLAGS $TARGET_CPPFLAGS $TARGET_LDFLAGS" AR="${OS_TRIPLET}-ar" diff --git a/recipes/cairo b/recipes/cairo index 992f72906..d4e6c0e42 100644 --- a/recipes/cairo +++ b/recipes/cairo @@ -7,13 +7,15 @@ imagedeps="meson ninja-build binutils" hostdeps="gcc pkg-config" deps="core-libs fontconfig freetype2 glib libpng libx11 libxcb libxext libxrender pixman zlib" -build() { +configure() { meson_configure \ -Dxlib-xcb=enabled \ -Dzlib=enabled \ -Dtee=enabled \ -Dtests=disabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/cglm b/recipes/cglm index 426dee9b4..9b51954f1 100644 --- a/recipes/cglm +++ b/recipes/cglm @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/coreutils b/recipes/coreutils index 30aff6792..869eb13b9 100644 --- a/recipes/coreutils +++ b/recipes/coreutils @@ -7,17 +7,19 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc automake autoconf libtool pkg-config" deps="core-libs tzdata" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure \ CFLAGS="$TARGET_CFLAGS -DSLOW_BUT_NO_HACKS" +} +build() { make -j${parallelism} } diff --git a/recipes/curl b/recipes/curl index 6919e9801..504c03d8f 100644 --- a/recipes/curl +++ b/recipes/curl @@ -7,15 +7,17 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs openssl zlib zstd" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-threaded-resolver \ --with-openssl +} +build() { make -j${parallelism} } diff --git a/recipes/dbus b/recipes/dbus index 4d6e445b8..dea0c1514 100644 --- a/recipes/dbus +++ b/recipes/dbus @@ -8,11 +8,11 @@ source_deps="autoconf-archive" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libexpat" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --runstatedir=/run \ --disable-doxygen-docs \ @@ -28,7 +28,9 @@ build() { --disable-launchd \ --disable-systemd \ --disable-tests +} +build() { make -j${parallelism} } diff --git a/recipes/diffutils b/recipes/diffutils index a5489ee04..c10833c3a 100644 --- a/recipes/diffutils +++ b/recipes/diffutils @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/findutils b/recipes/findutils index a4b523a34..5de92b09a 100644 --- a/recipes/findutils +++ b/recipes/findutils @@ -7,17 +7,19 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure \ --without-selinux +} +build() { make -j${parallelism} } diff --git a/recipes/fontconfig b/recipes/fontconfig index ef6814f75..ecb7d933c 100644 --- a/recipes/fontconfig +++ b/recipes/fontconfig @@ -8,17 +8,19 @@ imagedeps="gperf" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs freetype2 libexpat libxml" -regenerate() { +prepare() { autotools_recursive_regen # Make sure we regenerate this file rm -f src/fcobjshash.h } -build() { +configure() { autotools_configure \ --enable-libxml2 +} +build() { make -j${parallelism} } diff --git a/recipes/freeglut b/recipes/freeglut index f2f715e51..a77a0127b 100644 --- a/recipes/freeglut +++ b/recipes/freeglut @@ -7,11 +7,13 @@ imagedeps="cmake ninja-build git" hostdeps="gcc pkg-config" deps="core-libs libxi mesa glu" -build() { +configure() { cmake_configure \ -DFREEGLUT_BUILD_DEMOS=OFF \ -DFREEGLUT_BUILD_STATIC_LIBS=OFF +} +build() { ninja -j${parallelism} } diff --git a/recipes/freetype2 b/recipes/freetype2 index 2ffa3f9e7..c40ec9eab 100644 --- a/recipes/freetype2 +++ b/recipes/freetype2 @@ -8,15 +8,17 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs bzip2 libpng zlib" -regenerate() { +prepare() { NOCONFIGURE=1 ./autogen.sh cp /usr/local/share/automake-1.16/{config.sub,config.guess,install-sh} ./builds/unix/ } -build() { +configure() { autotools_configure \ --with-harfbuzz=no +} +build() { make -j${parallelism} } diff --git a/recipes/fribidi b/recipes/fribidi index 7a1323645..0d7c39df4 100644 --- a/recipes/fribidi +++ b/recipes/fribidi @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/frigg b/recipes/frigg index bcb72bfa0..4e511f572 100644 --- a/recipes/frigg +++ b/recipes/frigg @@ -6,11 +6,13 @@ tarball_blake2b="04cb1722162f1e0c32df9dbb5b6b57201de88382cee8b32972433bd396685bb imagedeps="meson ninja-build" hostdeps="pkg-config" -build() { +configure() { meson_configure \ --includedir=share/frigg/include \ -Dbuild_tests=disabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/gawk b/recipes/gawk index af1fae0a9..4cbca4d2c 100644 --- a/recipes/gawk +++ b/recipes/gawk @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs mpfr gmp readline" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/gcc b/recipes/gcc index adfae16fb..20a5da0e5 100644 --- a/recipes/gcc +++ b/recipes/gcc @@ -9,7 +9,7 @@ hostdeps="gcc autoconf-2.69 automake libtool pkg-config" deps="core-libs binutils zlib gmp mpfr mpc gettext" imagedeps="build-essential" -regenerate() { +prepare() { for i in "${base_dir}"/patches/gcc-host/*; do patch -p1 < "$i" done @@ -19,7 +19,7 @@ regenerate() { cp -pv /usr/local/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/ } -build() { +configure() { autotools_configure \ CFLAGS_FOR_BUILD="$HOST_CFLAGS" \ CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS" \ @@ -41,7 +41,9 @@ build() { --disable-multilib \ --with-system-zlib \ --enable-host-shared +} +build() { make -j${parallelism} all-gcc } diff --git a/recipes/gdbm b/recipes/gdbm index 970ef4c12..e8b2a32d5 100644 --- a/recipes/gdbm +++ b/recipes/gdbm @@ -7,17 +7,19 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs readline" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure \ --enable-libgdbm-compat +} +build() { make -j${parallelism} } diff --git a/recipes/gdk-pixbuf b/recipes/gdk-pixbuf index 314e8183e..05582e1d5 100644 --- a/recipes/gdk-pixbuf +++ b/recipes/gdk-pixbuf @@ -7,11 +7,13 @@ imagedeps="meson ninja-build libglib2.0-dev" hostdeps="gcc pkg-config" deps="core-libs glib libjpeg-turbo libpng libx11 libtiff" -build() { +configure() { meson_configure \ -Dgio_sniffing=false \ -Dman=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/gettext b/recipes/gettext index 407f115be..a2e320097 100644 --- a/recipes/gettext +++ b/recipes/gettext @@ -7,7 +7,7 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { ( cd gettext-runtime/libasprintf && autoreconf -fvi ) ( cd gettext-runtime/intl && autoreconf -fvi ) ( cd gettext-runtime && autoreconf -fvi ) @@ -16,7 +16,7 @@ regenerate() { autoreconf -fvi } -build() { +configure() { cp -rp ${source_dir}/. ./ ACLOCAL=true \ @@ -25,7 +25,9 @@ build() { AUTOHEADER=true \ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/git b/recipes/git index 313c34f00..610779d75 100644 --- a/recipes/git +++ b/recipes/git @@ -8,11 +8,11 @@ imagedeps="build-essential libcurl4-gnutls-dev" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs python zlib curl openssl openssh" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp ${source_dir}/. . configure_script_path=./configure \ @@ -22,7 +22,9 @@ build() { autotools_configure \ --with-gitconfig=/etc/gitconfig \ --with-python=python3 +} +build() { make -j${parallelism} } diff --git a/recipes/glib b/recipes/glib index 2acb6fd55..28e9bde82 100644 --- a/recipes/glib +++ b/recipes/glib @@ -7,10 +7,12 @@ imagedeps="meson ninja-build python3-setuptools" hostdeps="gcc pkg-config" deps="core-libs pcre2 libffi zlib" -build() { +configure() { meson_configure \ -Dxattr=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/glu b/recipes/glu index da80793a5..c1ed54959 100644 --- a/recipes/glu +++ b/recipes/glu @@ -7,10 +7,12 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs mesa" -build() { +configure() { meson_configure \ -Dgl_provider=gl +} +build() { ninja -j${parallelism} } diff --git a/recipes/gmp b/recipes/gmp index ff0afcece..6bfc83083 100644 --- a/recipes/gmp +++ b/recipes/gmp @@ -8,14 +8,16 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-cxx +} +build() { make -j${parallelism} } diff --git a/recipes/graphite2 b/recipes/graphite2 index 9b2d516e8..e2245ab01 100644 --- a/recipes/graphite2 +++ b/recipes/graphite2 @@ -7,9 +7,11 @@ imagedeps="cmake ninja-build" hostdeps="gcc pkg-config" deps="core-libs" -build() { +configure() { cmake_configure +} +build() { ninja -j${parallelism} } diff --git a/recipes/grep b/recipes/grep index 6bc28b421..46f786897 100644 --- a/recipes/grep +++ b/recipes/grep @@ -8,16 +8,18 @@ imagedeps="gperf" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs pcre2" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/groff b/recipes/groff index 0a964590d..959f020d5 100644 --- a/recipes/groff +++ b/recipes/groff @@ -8,13 +8,15 @@ imagedeps="groff" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} GROFFBIN=groff GROFF_BIN_PATH=/usr/bin } diff --git a/recipes/gsettings-desktop-schemas b/recipes/gsettings-desktop-schemas index 61e7ee160..eb969e79b 100644 --- a/recipes/gsettings-desktop-schemas +++ b/recipes/gsettings-desktop-schemas @@ -7,14 +7,16 @@ imagedeps="meson ninja-build libglib2.0-dev" hostdeps="gcc pkg-config" deps="core-libs glib" -regenerate() { +prepare() { sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in } -build() { +configure() { meson_configure \ -Dintrospection=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/gtk+-3 b/recipes/gtk+-3 index 87293b726..b02de5412 100644 --- a/recipes/gtk+-3 +++ b/recipes/gtk+-3 @@ -7,7 +7,7 @@ imagedeps="meson ninja-build libglib2.0-dev libgdk-pixbuf-2.0 python3-packaging" hostdeps="gcc pkg-config" deps="core-libs at-spi2-core cairo glib gdk-pixbuf libx11 libxext libxcb libxinerama libxrender libxrandr libxfixes libxdamage pango fribidi libepoxy libxkbcommon fontconfig freetype2 libxi harfbuzz libxcursor gsettings-desktop-schemas dbus" -build() { +configure() { meson_configure \ -Dprint_backends=file \ -Dintrospection=false \ @@ -15,7 +15,9 @@ build() { -Dbroadway_backend=true \ -Dwayland_backend=false \ -Dcolord=no +} +build() { ninja -j${parallelism} } diff --git a/recipes/gzip b/recipes/gzip index c12f73518..37858204c 100644 --- a/recipes/gzip +++ b/recipes/gzip @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/harfbuzz b/recipes/harfbuzz index 4bdf9bc55..39d83204d 100644 --- a/recipes/harfbuzz +++ b/recipes/harfbuzz @@ -7,7 +7,7 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs graphite2 glib zlib freetype2 cairo icu" -build() { +configure() { cp -rp "${source_dir}"/. ./ mkdir build && cd build @@ -24,11 +24,13 @@ build() { -Dintrospection=disabled \ -Dtests=disabled - ninja -j${parallelism} - cd .. } +build() { + ( cd build && ninja -j${parallelism} ) +} + package() { ( cd build && DESTDIR="${dest_dir}" ninja install ) diff --git a/recipes/icu b/recipes/icu index 6c06d98e7..4e7dad1ba 100644 --- a/recipes/icu +++ b/recipes/icu @@ -9,7 +9,7 @@ source_imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen cp source/config/{mh-linux,mh-unknown} @@ -26,11 +26,13 @@ regenerate() { cd .. } -build() { +configure() { configure_script_path=${source_dir}/source/configure \ autotools_configure \ --with-cross-build=${source_dir}/cross-build +} +build() { make -j${parallelism} } diff --git a/recipes/kernel b/recipes/kernel index dac8a1c2f..05e55e810 100644 --- a/recipes/kernel +++ b/recipes/kernel @@ -7,7 +7,7 @@ source_allow_network="yes" hostdeps="gcc v" deps="core-libs" -regenerate() { +prepare() { ./get-deps } diff --git a/recipes/less b/recipes/less index d5289997c..0933449c3 100644 --- a/recipes/less +++ b/recipes/less @@ -7,13 +7,15 @@ source_hostdeps="autoconf automake libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs ncurses" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libarchive b/recipes/libarchive index f448517e7..85bca4f64 100644 --- a/recipes/libarchive +++ b/recipes/libarchive @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs zlib xz zstd libexpat libxml" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libepoxy b/recipes/libepoxy index 1655cad20..bed6a7d00 100644 --- a/recipes/libepoxy +++ b/recipes/libepoxy @@ -7,11 +7,13 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs mesa xorg-proto libx11" -build() { +configure() { meson_configure \ -Degl=no \ -Dtests=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/libexpat b/recipes/libexpat index 663ebbd01..7bcc83eaa 100644 --- a/recipes/libexpat +++ b/recipes/libexpat @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { ./buildconf.sh --force } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libffi b/recipes/libffi index cb40ddb2b..b79a55f97 100644 --- a/recipes/libffi +++ b/recipes/libffi @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libfontenc b/recipes/libfontenc index a4482dadb..e8f149b74 100644 --- a/recipes/libfontenc +++ b/recipes/libfontenc @@ -8,13 +8,15 @@ source_deps="xorg-font-util xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libgcrypt b/recipes/libgcrypt index 004ebb2da..436e939fc 100644 --- a/recipes/libgcrypt +++ b/recipes/libgcrypt @@ -8,11 +8,11 @@ imagedeps="build-essential libgpg-error-dev" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libgpg-error" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ @@ -20,7 +20,9 @@ build() { --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 0e7a13f3e..9b725910b 100644 --- a/recipes/libgpg-error +++ b/recipes/libgpg-error @@ -8,13 +8,13 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { cp -v src/syscfg/lock-obj-pub.$ARCHITECTURE-unknown-linux-gnu.h src/syscfg/lock-obj-pub.vinix-mlibc.h autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ @@ -22,7 +22,9 @@ build() { CFLAGS_FOR_BUILD="$HOST_CFLAGS" \ CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS" \ LDFLAGS_FOR_BUILD="$HOST_LDFLAGS" +} +build() { make -j${parallelism} } diff --git a/recipes/libice b/recipes/libice index 4342374cf..dc30a778e 100644 --- a/recipes/libice +++ b/recipes/libice @@ -8,13 +8,15 @@ source_deps="xorg-util-macros xtrans" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto xtrans" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libiconv b/recipes/libiconv index f0bfd9cfa..9edfcedf4 100644 --- a/recipes/libiconv +++ b/recipes/libiconv @@ -8,7 +8,7 @@ imagedeps="binutils" hostdeps="gcc autoconf automake libtool pkg-config" deps="mlibc libgcc libstdc++" -regenerate() { +prepare() { cp /usr/local/share/aclocal/libtool.m4 ./m4/ cp /usr/local/share/aclocal/libtool.m4 ./libcharset/m4/ cp /usr/local/share/libtool/build-aux/ltmain.sh ./build-aux/ @@ -19,9 +19,11 @@ regenerate() { autotools_recursive_regen -I"${source_dir}"/m4 -I"${source_dir}"/srcm4 } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libintl b/recipes/libintl index 9ed0db0ba..dc0d958f5 100644 --- a/recipes/libintl +++ b/recipes/libintl @@ -4,7 +4,7 @@ revision=1 hostdeps="gcc automake autoconf libtool pkg-config" deps="mlibc libgcc libstdc++ libiconv" -build() { +configure() { ACLOCAL=true \ AUTOCONF=true \ AUTOMAKE=true \ @@ -28,7 +28,9 @@ build() { --without-xz 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 aab1c8606..c23ac20c8 100644 --- a/recipes/libjpeg-turbo +++ b/recipes/libjpeg-turbo @@ -7,9 +7,11 @@ imagedeps="build-essential cmake ninja-build git nasm" hostdeps="gcc pkg-config" deps="core-libs" -build() { +configure() { cmake_configure +} +build() { ninja -j${parallelism} } diff --git a/recipes/libpipeline b/recipes/libpipeline index b3ed901d1..139495fe7 100644 --- a/recipes/libpipeline +++ b/recipes/libpipeline @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libpng b/recipes/libpng index 6de211a70..049779ee9 100644 --- a/recipes/libpng +++ b/recipes/libpng @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libsm b/recipes/libsm index bee48a98c..42dfc6942 100644 --- a/recipes/libsm +++ b/recipes/libsm @@ -8,13 +8,15 @@ source_deps="xorg-util-macros xtrans" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libice" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libtiff b/recipes/libtiff index 4c22e07b8..1f5529279 100644 --- a/recipes/libtiff +++ b/recipes/libtiff @@ -7,11 +7,11 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs freeglut libjpeg-turbo zlib zstd xz" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --without-x \ --enable-zlib \ @@ -20,7 +20,9 @@ build() { --enable-lzma \ --disable-webp \ --enable-cxx +} +build() { make -j${parallelism} } diff --git a/recipes/libunistring b/recipes/libunistring index b3de987dc..eb8b16aa8 100644 --- a/recipes/libunistring +++ b/recipes/libunistring @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libwebp b/recipes/libwebp index d890a0eca..4344af9e4 100644 --- a/recipes/libwebp +++ b/recipes/libwebp @@ -7,18 +7,20 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libjpeg-turbo libpng freeglut sdl2 libtiff" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-libwebpmux \ --enable-libwebpdemux \ --enable-libwebpdecoder \ --enable-libwebpextras \ --enable-swap-16bit-csp +} +build() { make -j${parallelism} } diff --git a/recipes/libx11 b/recipes/libx11 index 3cdd819d1..dd4735596 100644 --- a/recipes/libx11 +++ b/recipes/libx11 @@ -9,15 +9,17 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxcb xtrans" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --disable-ipv6 \ --with-keysymdefdir=${sysroot_dir}/usr/include/X11 +} +build() { make -j${parallelism} } diff --git a/recipes/libxau b/recipes/libxau index 8739b09e8..f78e790c2 100644 --- a/recipes/libxau +++ b/recipes/libxau @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxaw b/recipes/libxaw index 3ddea4fe3..52cfecd22 100644 --- a/recipes/libxaw +++ b/recipes/libxaw @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxmu libxpm" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxcb b/recipes/libxcb index adb594cbe..0c8473d5b 100644 --- a/recipes/libxcb +++ b/recipes/libxcb @@ -8,14 +8,16 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxau libxdmcp xcb-proto" -regenerate() { +prepare() { autotools_recursive_regen sed -i 's/pthread-stubs//' "${source_dir}"/configure } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxcrypt b/recipes/libxcrypt index ae046f8ab..83d08faaf 100644 --- a/recipes/libxcrypt +++ b/recipes/libxcrypt @@ -8,15 +8,17 @@ imagedeps="python3-passlib" hostdeps="gcc automake autoconf libtool pkg-config" deps="mlibc libgcc libstdc++" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-obsolete-api=yes \ --disable-xcrypt-compat-files +} +build() { make -j${parallelism} } diff --git a/recipes/libxcursor b/recipes/libxcursor index 2e2d37db5..1b2c54184 100644 --- a/recipes/libxcursor +++ b/recipes/libxcursor @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxrender libxfixes libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxcvt b/recipes/libxcvt index c7832b9ce..b5890fc3a 100644 --- a/recipes/libxcvt +++ b/recipes/libxcvt @@ -7,9 +7,11 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs" -build() { +configure() { meson_configure +} +build() { ninja -j${parallelism} } diff --git a/recipes/libxdamage b/recipes/libxdamage index 8523be15e..5db9e23fb 100644 --- a/recipes/libxdamage +++ b/recipes/libxdamage @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxfixes" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxdmcp b/recipes/libxdmcp index fabf06940..4ccf09fa5 100644 --- a/recipes/libxdmcp +++ b/recipes/libxdmcp @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxext b/recipes/libxext index fa63f4462..4f94b3258 100644 --- a/recipes/libxext +++ b/recipes/libxext @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxfixes b/recipes/libxfixes index 83eb909d2..af5580294 100644 --- a/recipes/libxfixes +++ b/recipes/libxfixes @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxfont2 b/recipes/libxfont2 index fcbbdb8a1..67252d0a5 100644 --- a/recipes/libxfont2 +++ b/recipes/libxfont2 @@ -8,16 +8,18 @@ source_deps="xorg-util-macros xtrans" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto xtrans freetype2 bzip2 libfontenc zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --with-bzip2 \ --disable-devel-docs \ --disable-selective-werror +} +build() { make -j${parallelism} } diff --git a/recipes/libxft b/recipes/libxft index 18e526bf8..f8aadb7cf 100644 --- a/recipes/libxft +++ b/recipes/libxft @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxrender fontconfig" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxi b/recipes/libxi index 4d22d77d7..985ede9f4 100644 --- a/recipes/libxi +++ b/recipes/libxi @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxext libxfixes" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxinerama b/recipes/libxinerama index c0b0edcfd..06695a38b 100644 --- a/recipes/libxinerama +++ b/recipes/libxinerama @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxext xorg-proto" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxkbcommon b/recipes/libxkbcommon index 62653287d..e851d899d 100644 --- a/recipes/libxkbcommon +++ b/recipes/libxkbcommon @@ -7,12 +7,14 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs libxcb libxml xkeyboard-config" -build() { +configure() { meson_configure \ -Dxkb-config-root="$prefix"/share/X11/xkb \ -Denable-x11=true \ -Denable-wayland=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/libxkbfile b/recipes/libxkbfile index f591012b3..4c70a12d6 100644 --- a/recipes/libxkbfile +++ b/recipes/libxkbfile @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxml b/recipes/libxml index 47af73f7b..0bb290850 100644 --- a/recipes/libxml +++ b/recipes/libxml @@ -7,18 +7,20 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs zlib icu readline" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --with-threads \ --disable-ipv6 \ --without-python \ --with-history \ --with-icu +} +build() { make -j${parallelism} } diff --git a/recipes/libxmu b/recipes/libxmu index 7fc4ff9f5..2486fe03f 100644 --- a/recipes/libxmu +++ b/recipes/libxmu @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxext libxt" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxpm b/recipes/libxpm index be321e494..ed64bf999 100644 --- a/recipes/libxpm +++ b/recipes/libxpm @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxext libxt" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxrandr b/recipes/libxrandr index e808fffc2..d39da6ee5 100644 --- a/recipes/libxrandr +++ b/recipes/libxrandr @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libx11 libxrender libxext" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxrender b/recipes/libxrender index 095c7f39b..ec8ebe69a 100644 --- a/recipes/libxrender +++ b/recipes/libxrender @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxshmfence b/recipes/libxshmfence index 0563afddc..5e996376f 100644 --- a/recipes/libxshmfence +++ b/recipes/libxshmfence @@ -8,14 +8,16 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --disable-futex +} +build() { make -j${parallelism} } diff --git a/recipes/libxt b/recipes/libxt index b8f9802b6..518338771 100644 --- a/recipes/libxt +++ b/recipes/libxt @@ -9,14 +9,16 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 libsm" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --with-appdefaultdir=/etc/X11/app-defaults +} +build() { make -j${parallelism} } diff --git a/recipes/libxtst b/recipes/libxtst index 843c806e8..fe2406e61 100644 --- a/recipes/libxtst +++ b/recipes/libxtst @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxext libxi libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxv b/recipes/libxv index 9e35ba9c3..6cc144d94 100644 --- a/recipes/libxv +++ b/recipes/libxv @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxext" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm index 285986bed..7f308901a 100644 --- a/recipes/libxxf86vm +++ b/recipes/libxxf86vm @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libxext" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/libzip b/recipes/libzip index 01f1e24da..d387ee224 100644 --- a/recipes/libzip +++ b/recipes/libzip @@ -7,11 +7,13 @@ imagedeps="cmake ninja-build git" hostdeps="gcc pkg-config" deps="core-libs zlib bzip2 xz zstd openssl" -build() { +configure() { cmake_configure \ -DENABLE_GNUTLS=OFF \ -DBUILD_DOC=OFF +} +build() { ninja -j${parallelism} } diff --git a/recipes/limine b/recipes/limine index de3c45f10..14566cd58 100644 --- a/recipes/limine +++ b/recipes/limine @@ -8,11 +8,11 @@ imagedeps="mtools nasm" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { if [ "$ARCHITECTURE" = "x86_64" ]; then X86_FLAGS="--enable-bios \ --enable-bios-cd \ @@ -26,7 +26,9 @@ build() { --enable-uefi-$ARCHITECTURE \ --enable-uefi-cd \ TOOLCHAIN_FOR_TARGET=${OS_TRIPLET} +} +build() { make -j${parallelism} } diff --git a/recipes/llvm b/recipes/llvm index ee6af523c..181d05112 100644 --- a/recipes/llvm +++ b/recipes/llvm @@ -7,7 +7,7 @@ imagedeps="build-essential cmake ninja-build git" hostdeps="gcc pkg-config" deps="core-libs ncurses zlib zstd libffi" -build() { +configure() { cmake_source_dir="${source_dir}/llvm" \ cmake_configure \ -UBUILD_SHARED_LIBS \ @@ -20,7 +20,9 @@ build() { -DLLVM_DEFAULT_TARGET_TRIPLE=${OS_TRIPLET} \ -DLLVM_HOST_TRIPLE=${OS_TRIPLET} \ -Wno-dev +} +build() { ninja -j${parallelism} } diff --git a/recipes/make b/recipes/make index efe49df26..37d208a97 100644 --- a/recipes/make +++ b/recipes/make @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/man-db b/recipes/man-db index 6b3a6c8b6..6b832b201 100644 --- a/recipes/man-db +++ b/recipes/man-db @@ -8,17 +8,19 @@ imagedeps="groff" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs bash gdbm groff less libpipeline zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --disable-setuid \ --with-systemdtmpfilesdir= \ --with-systemdsystemunitdir= \ --with-pager=/usr/bin/less +} +build() { make -j${parallelism} } diff --git a/recipes/mesa b/recipes/mesa index 09b883162..d5a38f996 100644 --- a/recipes/mesa +++ b/recipes/mesa @@ -7,14 +7,16 @@ imagedeps="binutils meson ninja-build python3-setuptools python3-mako" hostdeps="gcc pkg-config" deps="core-libs llvm zlib libxshmfence libxrandr libxdamage libxxf86vm libxfixes libx11 libxext libxcb libexpat" -build() { +configure() { meson_configure \ -Dglx=xlib \ -Dplatforms=x11 \ -Dgallium-drivers=swrast \ -Dvulkan-drivers= \ -Dllvm=enabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/mesa-demos b/recipes/mesa-demos index b3eeaf958..c5d9a940d 100644 --- a/recipes/mesa-demos +++ b/recipes/mesa-demos @@ -7,11 +7,11 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs freetype2 mesa glu libx11 libxext" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-autotools \ --disable-gles1 \ @@ -19,7 +19,9 @@ build() { --disable-libdrm \ --with-system-data-files \ --with-glut=no +} +build() { make -j${parallelism} } diff --git a/recipes/mlibc b/recipes/mlibc index cc845c24e..6cbce33a6 100644 --- a/recipes/mlibc +++ b/recipes/mlibc @@ -8,7 +8,7 @@ hostdeps="gcc pkg-config libgcc-binaries" builddeps="freestnd-c-hdrs freestnd-cxx-hdrs frigg" deps="mlibc-headers" -build() { +configure() { CFLAGS="$TARGET_CFLAGS" \ CXXFLAGS="$TARGET_CXXFLAGS" \ LDFLAGS="-Wl,/usr/local/libgcc-binaries/libgcc-$ARCHITECTURE.a" \ @@ -21,7 +21,9 @@ build() { -Ddisable_intl_option=true \ -Ddisable_libgcc_dependency=true \ -Duse_freestnd_hdrs=enabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/mlibc-headers b/recipes/mlibc-headers index 3f88624a2..527a4642d 100644 --- a/recipes/mlibc-headers +++ b/recipes/mlibc-headers @@ -4,13 +4,15 @@ from_source=mlibc imagedeps="meson ninja-build" hostdeps="pkg-config" -build() { +configure() { meson_configure \ -Dheaders_only=true \ -Ddisable_crypt_option=true \ -Ddisable_iconv_option=true \ -Ddisable_intl_option=true +} +build() { ninja -j${parallelism} } diff --git a/recipes/mpc b/recipes/mpc index cebea0904..9c8eda9ac 100644 --- a/recipes/mpc +++ b/recipes/mpc @@ -8,13 +8,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs gmp mpfr" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/mpfr b/recipes/mpfr index 422733ac3..b1e400b39 100644 --- a/recipes/mpfr +++ b/recipes/mpfr @@ -9,11 +9,11 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs gmp" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ @@ -22,7 +22,9 @@ build() { --enable-shared=yes \ --enable-thread-safe \ --with-pic +} +build() { make -j${parallelism} } diff --git a/recipes/nano b/recipes/nano index f84f52106..636973e87 100644 --- a/recipes/nano +++ b/recipes/nano @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc automake autoconf libtool pkg-config" deps="core-libs ncurses" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/nasm b/recipes/nasm index 047f5ff21..390a6cdaf 100644 --- a/recipes/nasm +++ b/recipes/nasm @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc automake autoconf libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen -I$(realpath ./autoconf) } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make } diff --git a/recipes/ncurses b/recipes/ncurses index 920b9247b..b4cc36ed1 100644 --- a/recipes/ncurses +++ b/recipes/ncurses @@ -8,12 +8,12 @@ imagedeps="build-essential ncurses-bin patchelf" hostdeps="gcc automake autoconf libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { cp -pv /usr/local/share/libtool/build-aux/config.guess ./ cp -pv /usr/local/share/libtool/build-aux/config.sub ./ } -build() { +configure() { cf_cv_func_nanosleep=yes \ autotools_configure \ --enable-widec \ @@ -27,7 +27,9 @@ build() { --with-pkg-config-libdir=/usr/lib/pkgconfig \ --with-termlib \ --without-ada +} +build() { make -j${parallelism} } diff --git a/recipes/nettle b/recipes/nettle index ccc83e2dc..162617f35 100644 --- a/recipes/nettle +++ b/recipes/nettle @@ -8,13 +8,15 @@ imagedeps="build-essential" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs gmp" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/openssh b/recipes/openssh index da96272a6..31e98683e 100644 --- a/recipes/openssh +++ b/recipes/openssh @@ -7,13 +7,13 @@ source_hostdeps="autoconf automake libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs zlib openssl" -regenerate() { +prepare() { autotools_recursive_regen cp -v $(find /usr/local/share/automake* -name config.sub) . } -build() { +configure() { ossh_cv_utmpx_h_has_ut_addr=no \ autotools_configure \ --disable-strip \ @@ -22,7 +22,9 @@ build() { --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 951693b31..a99289859 100644 --- a/recipes/openssl +++ b/recipes/openssl @@ -6,7 +6,7 @@ tarball_blake2b="2fdba6ca0188928ab2f74e606136afca66cfa0467170fa6298ef160b64ac6fd hostdeps="gcc pkg-config" deps="core-libs zlib" -build() { +configure() { CC=${OS_TRIPLET}-gcc \ CXX=${OS_TRIPLET}-g++ \ AR=${OS_TRIPLET}-ar \ @@ -18,7 +18,9 @@ build() { shared \ zlib-dynamic \ no-afalgeng +} +build() { make -j${parallelism} } diff --git a/recipes/pango b/recipes/pango index 67613ed91..fb6a627cd 100644 --- a/recipes/pango +++ b/recipes/pango @@ -7,10 +7,12 @@ imagedeps="meson ninja-build libglib2.0-dev" hostdeps="gcc pkg-config" deps="core-libs glib fontconfig freetype2 fribidi cairo xorg-proto libx11 xtrans libxext harfbuzz libxft" -build() { +configure() { meson_configure \ -Dintrospection=disabled +} +build() { ninja -j${parallelism} } diff --git a/recipes/pcre2 b/recipes/pcre2 index bb06b486b..4b1261b24 100644 --- a/recipes/pcre2 +++ b/recipes/pcre2 @@ -7,11 +7,11 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs bzip2 ncurses readline zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-unicode \ --enable-jit \ @@ -20,7 +20,9 @@ build() { --enable-pcre2grep-libz \ --enable-pcre2grep-libbz2 \ --enable-pcre2test-libreadline +} +build() { make -j${parallelism} } diff --git a/recipes/pixman b/recipes/pixman index 80438c3ce..79942babf 100644 --- a/recipes/pixman +++ b/recipes/pixman @@ -7,9 +7,11 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs libpng" -build() { +configure() { meson_configure +} +build() { ninja -j${parallelism} } diff --git a/recipes/python b/recipes/python index 234a79cd3..159a6b5ed 100644 --- a/recipes/python +++ b/recipes/python @@ -8,11 +8,11 @@ source_deps="autoconf-archive" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs bzip2 xz zlib openssl ncurses readline gdbm tzdata libexpat libffi" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { echo "ac_cv_file__dev_ptmx=yes" > /tmp/configsite echo "ac_cv_file__dev_ptc=yes" >> /tmp/configsite echo "ac_cv_func_sched_setscheduler=no" >> /tmp/configsite @@ -25,7 +25,9 @@ build() { --with-build-python=python3 \ --disable-ipv6 \ --enable-shared +} +build() { make -j${parallelism} } diff --git a/recipes/readline b/recipes/readline index 89d901b2a..ce46fabc2 100644 --- a/recipes/readline +++ b/recipes/readline @@ -9,7 +9,7 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs ncurses" -regenerate() { +prepare() { curl -Lo readline82-001 https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-001 curl -Lo readline82-002 https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-002 curl -Lo readline82-003 https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-003 @@ -29,11 +29,13 @@ regenerate() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --enable-multibyte \ --with-curses +} +build() { make SHLIB_LIBS="-lncursesw -ltinfow" -j${parallelism} } diff --git a/recipes/sdl2 b/recipes/sdl2 index 4ced54673..5025c5fda 100644 --- a/recipes/sdl2 +++ b/recipes/sdl2 @@ -7,7 +7,7 @@ imagedeps="cmake ninja-build git" hostdeps="gcc pkg-config" deps="core-libs libx11 libxext libxcursor libxi libxfixes libxrandr libxrender libxxf86vm mesa" -build() { +configure() { cmake_configure \ -DSDL_ALTIVEC=OFF \ -DSDL_DISKAUDIO=OFF \ @@ -41,7 +41,9 @@ build() { -DSDL_HIDAPI=OFF \ -DSDL_SHARED=ON \ -DSDL_STATIC=OFF +} +build() { ninja -j${parallelism} } diff --git a/recipes/sed b/recipes/sed index 5c1e6542d..ca54a8d0e 100644 --- a/recipes/sed +++ b/recipes/sed @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/sqlite b/recipes/sqlite index d06dd2fa8..36bfd8a5f 100644 --- a/recipes/sqlite +++ b/recipes/sqlite @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs readline zlib" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ CFLAGS="$TARGET_CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_FTS3_TOKENIZER=1" \ --enable-readline \ --enable-fts5 +} +build() { make -j${parallelism} } diff --git a/recipes/taisei b/recipes/taisei index d8fe5abff..3cd650d93 100644 --- a/recipes/taisei +++ b/recipes/taisei @@ -7,13 +7,15 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs freetype2 libpng sdl2 libwebp zlib cglm openssl libzip" -build() { +configure() { meson_configure \ -Ddocs=false \ -Da_sdl2mixer=false \ -Da_default=null \ -Db_lto=false +} +build() { ninja -j${parallelism} } diff --git a/recipes/tar b/recipes/tar index d705eb520..899e5f334 100644 --- a/recipes/tar +++ b/recipes/tar @@ -7,16 +7,18 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { cp -rp "${source_dir}"/. ./ configure_script_path=./configure \ autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/v b/recipes/v index 5ee21f04c..03385848f 100644 --- a/recipes/v +++ b/recipes/v @@ -7,7 +7,7 @@ source_allow_network="yes" hostdeps="gcc" deps="core-libs" -regenerate() { +prepare() { curl -o v.c https://raw.githubusercontent.com/vlang/vc/a431875ed96456e7d2b6e1a5794357a1487d41eb/v.c } diff --git a/recipes/xbitmaps b/recipes/xbitmaps index bc2ade9c6..c18de42e5 100644 --- a/recipes/xbitmaps +++ b/recipes/xbitmaps @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xcb-proto b/recipes/xcb-proto index 3b036db28..163627df5 100644 --- a/recipes/xcb-proto +++ b/recipes/xcb-proto @@ -8,13 +8,15 @@ imagedeps="libxml2" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xf86-input-keyboard b/recipes/xf86-input-keyboard index 0bc813a7d..b10d0cab8 100644 --- a/recipes/xf86-input-keyboard +++ b/recipes/xf86-input-keyboard @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-server xorg-util-macros libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xf86-input-mouse b/recipes/xf86-input-mouse index e9dc1dd74..e4534d74b 100644 --- a/recipes/xf86-input-mouse +++ b/recipes/xf86-input-mouse @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-server xorg-util-macros libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev index c4bed64eb..62e19a72f 100644 --- a/recipes/xf86-video-fbdev +++ b/recipes/xf86-video-fbdev @@ -8,15 +8,17 @@ source_deps="xorg-server xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-server xorg-util-macros" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { SYSROOT=${sysroot_dir} \ autotools_configure \ --disable-pciaccess +} +build() { make -j${parallelism} } diff --git a/recipes/xkeyboard-config b/recipes/xkeyboard-config index dcc859fca..18df27f1b 100644 --- a/recipes/xkeyboard-config +++ b/recipes/xkeyboard-config @@ -7,10 +7,12 @@ imagedeps="meson ninja-build" hostdeps="gcc pkg-config" deps="core-libs xorg-xkbcomp" -build() { +configure() { meson_configure \ -Dxorg-rules-symlinks=true +} +build() { ninja -j${parallelism} } diff --git a/recipes/xorg-font-util b/recipes/xorg-font-util index eb038908f..9af3d2de8 100644 --- a/recipes/xorg-font-util +++ b/recipes/xorg-font-util @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-proto b/recipes/xorg-proto index 9b602d7e4..5add3d11e 100644 --- a/recipes/xorg-proto +++ b/recipes/xorg-proto @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-server b/recipes/xorg-server index d88df1a1e..2f8e65278 100644 --- a/recipes/xorg-server +++ b/recipes/xorg-server @@ -8,11 +8,11 @@ source_deps="xtrans xorg-font-util xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros xorg-proto xcb-proto xtrans libxinerama libxcvt libxshmfence libx11 libxaw libxxf86vm libxkbfile libxmu libxfont2 libepoxy libxi libxv libxdamage libxrender libxrandr libxcb libxfixes libxext nettle xorg-xkbcomp xkeyboard-config pixman" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --with-xkb-bin-directory=/usr/bin \ --with-xkb-path=/usr/share/X11/xkb \ @@ -40,7 +40,9 @@ build() { --disable-libdrm \ --disable-glamor \ --disable-glx +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-twm b/recipes/xorg-twm index 64e7c7fa6..0817a34ac 100644 --- a/recipes/xorg-twm +++ b/recipes/xorg-twm @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxmu" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-util-macros b/recipes/xorg-util-macros index 4ccbdc0a7..ab54f1119 100644 --- a/recipes/xorg-util-macros +++ b/recipes/xorg-util-macros @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xauth b/recipes/xorg-xauth index 8d0e4fff0..ada20d40e 100644 --- a/recipes/xorg-xauth +++ b/recipes/xorg-xauth @@ -8,13 +8,15 @@ source_deps="xorg-util-macros xtrans" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 libxau libxext libxmu" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xclock b/recipes/xorg-xclock index 1ddd738ff..fb8271605 100644 --- a/recipes/xorg-xclock +++ b/recipes/xorg-xclock @@ -8,15 +8,17 @@ source_deps="xorg-util-macros gettext" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 libxaw libxft libxkbfile libxmu libxrender" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --with-appdefaultdir=/etc/X11/app-defaults \ --disable-selective-werror +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xeyes b/recipes/xorg-xeyes index 7fcca6154..e738d876e 100644 --- a/recipes/xorg-xeyes +++ b/recipes/xorg-xeyes @@ -8,14 +8,16 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 libxcb libxext libxi libxmu libxrender libxt" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure \ --disable-selective-werror +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xinit b/recipes/xorg-xinit index bc5d8aa43..aad03c6ab 100644 --- a/recipes/xorg-xinit +++ b/recipes/xorg-xinit @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 xorg-xauth xorg-xmodmap xorg-xrdb" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xkbcomp b/recipes/xorg-xkbcomp index e8c2a4554..f7f0cb2b7 100644 --- a/recipes/xorg-xkbcomp +++ b/recipes/xorg-xkbcomp @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libxkbfile" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xkbutils b/recipes/xorg-xkbutils index b3535a168..1bff2802e 100644 --- a/recipes/xorg-xkbutils +++ b/recipes/xorg-xkbutils @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-proto libx11 libxt libxaw" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xmodmap b/recipes/xorg-xmodmap index 58f51b960..784d067b9 100644 --- a/recipes/xorg-xmodmap +++ b/recipes/xorg-xmodmap @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xrdb b/recipes/xorg-xrdb index 6f6c09bae..4529f4795 100644 --- a/recipes/xorg-xrdb +++ b/recipes/xorg-xrdb @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs libx11 libxmu" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xorg-xsetroot b/recipes/xorg-xsetroot index 83376cc96..a9a14773d 100644 --- a/recipes/xorg-xsetroot +++ b/recipes/xorg-xsetroot @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros libx11 libxmu xbitmaps libxcursor" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xtrans b/recipes/xtrans index d25a45a73..dfdf8c501 100644 --- a/recipes/xtrans +++ b/recipes/xtrans @@ -8,13 +8,15 @@ source_deps="xorg-util-macros" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs xorg-util-macros" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/xz b/recipes/xz index a32b89e2d..873d01c6e 100644 --- a/recipes/xz +++ b/recipes/xz @@ -7,13 +7,15 @@ source_hostdeps="automake autoconf libtool pkg-config" hostdeps="gcc autoconf automake libtool pkg-config" deps="core-libs" -regenerate() { +prepare() { autotools_recursive_regen } -build() { +configure() { autotools_configure +} +build() { make -j${parallelism} } diff --git a/recipes/zlib b/recipes/zlib index 80de17acf..073f6f9b8 100644 --- a/recipes/zlib +++ b/recipes/zlib @@ -7,11 +7,13 @@ imagedeps="patchelf" hostdeps="gcc pkg-config" deps="core-libs" -build() { +configure() { prefix="${prefix}" \ CHOST="${OS_TRIPLET}" \ ${source_dir}/configure +} +build() { make -j${parallelism} } diff --git a/source-recipes/gcc-host b/source-recipes/gcc-host index 489112403..4b5ac26b2 100644 --- a/source-recipes/gcc-host +++ b/source-recipes/gcc-host @@ -6,7 +6,7 @@ hostdeps="automake autoconf-2.69 libtool pkg-config" imagedeps="git" allow_network="yes" -regenerate() { +prepare() { ./contrib/download_prerequisites # Gettext causes issues and we don't want it anyways. diff --git a/source-recipes/libtool b/source-recipes/libtool index 8ace5f658..892514d3a 100644 --- a/source-recipes/libtool +++ b/source-recipes/libtool @@ -6,7 +6,7 @@ hostdeps="autoconf automake" imagedeps="help2man git" allow_network="yes" -regenerate() { +prepare() { git clone https://git.savannah.gnu.org/git/gnulib.git git -C gnulib checkout c6942e47da903adc68b887cbedfac07b099088f2 ./bootstrap --force --skip-git --skip-po --gnulib-srcdir=`pwd`/gnulib diff --git a/source-recipes/pkg-config b/source-recipes/pkg-config index 547d3a8b0..04c90e47f 100644 --- a/source-recipes/pkg-config +++ b/source-recipes/pkg-config @@ -4,6 +4,6 @@ tarball_url="https://distfiles.ariadne.space/pkgconf/pkgconf-${version}.tar.xz" tarball_blake2b="c2a89e932e7671785799f4b82beb75e92f246c152c03e88c847cedef39f2123da0544ff914d1c1512b8616f8b8cfd9f5115b33560042bcfa7ac5f78c0ceb2a27" hostdeps="autoconf automake libtool" -regenerate() { +prepare() { autotools_recursive_regen }