From 5097c70245514908477c1d032f7399390c089292 Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <dev.xlheureux@gmail.com>
Date: Sun, 3 May 2020 18:55:55 -0400
Subject: [PATCH] Fix compilation on FreeBSD
`make` is `gmake` on FreeBSD, so add a variable to include this change in command.
---
config.sh | 4 +++-
cook.sh | 9 +++++++--
recipes/atk/recipe.sh | 6 +++---
recipes/autoconf/recipe.sh | 6 +++---
recipes/automake/recipe.sh | 6 +++---
recipes/bash/recipe.sh | 6 +++---
recipes/bootloader/recipe.sh | 2 +-
recipes/cairo/recipe.sh | 6 +++---
recipes/cairodemo/recipe.sh | 2 +-
recipes/cmatrix/recipe.sh | 6 +++---
recipes/curl/recipe.sh | 6 +++---
recipes/dash/recipe.sh | 6 +++---
recipes/diffutils/recipe.sh | 6 +++---
recipes/dosbox/recipe.sh | 6 +++---
recipes/duktape/recipe.sh | 4 ++--
recipes/eduke32/recipe.sh | 4 ++--
recipes/expat/recipe.sh | 6 +++---
recipes/ffmpeg/recipe.sh | 6 +++---
recipes/fontconfig/recipe.sh | 6 +++---
recipes/freeciv/recipe.sh | 6 +++---
recipes/freeglut/recipe.sh | 6 +++---
recipes/freetype/recipe.sh | 6 +++---
recipes/fribidi/recipe.sh | 6 +++---
recipes/gawk/recipe.sh | 6 +++---
recipes/gcc/recipe.sh | 6 +++---
recipes/gdk-pixbuf/recipe.sh | 2 +-
recipes/gears/recipe.sh | 2 +-
recipes/gettext/recipe.sh | 6 +++---
recipes/gigalomania/recipe.sh | 6 +++---
recipes/git/recipe.sh | 6 +++---
recipes/glib/recipe.sh | 6 +++---
recipes/gnu-binutils/recipe.sh | 6 +++---
recipes/gnu-grep/recipe.sh | 6 +++---
recipes/gnu-make/recipe.sh | 6 +++---
recipes/gstreamer/recipe.sh | 6 +++---
recipes/harfbuzz/recipe.sh | 6 +++---
recipes/jansson/recipe.sh | 6 +++---
recipes/kernel/recipe.sh | 2 +-
recipes/libc-bench/recipe.sh | 4 ++--
recipes/libffi/recipe.sh | 6 +++---
recipes/libiconv/recipe.sh | 6 +++---
recipes/libjpeg/recipe.sh | 6 +++---
recipes/libogg/recipe.sh | 6 +++---
recipes/liborbital/recipe.sh | 2 +-
recipes/libpng/recipe.sh | 6 +++---
recipes/libsodium/recipe.sh | 6 +++---
recipes/libvorbis/recipe.sh | 6 +++---
recipes/libxml2/recipe.sh | 6 +++---
recipes/llvm/recipe.sh | 6 +++---
recipes/lua/recipe.sh | 4 ++--
recipes/mdp/recipe.sh | 6 +++---
recipes/mesa/recipe.sh | 6 +++---
recipes/mesa_glu/recipe.sh | 6 +++---
recipes/mgba/recipe.sh | 4 ++--
recipes/nasm/recipe.sh | 6 +++---
recipes/ncdu/recipe.sh | 6 +++---
recipes/ncurses/recipe.sh | 6 +++---
recipes/ncursesw/recipe.sh | 6 +++---
recipes/netsurf/recipe.sh | 6 +++---
recipes/neverball/recipe.sh | 8 ++++----
recipes/newlib/recipe.sh | 6 +++---
recipes/newlibtest/recipe.sh | 6 +++---
recipes/nghttp2/recipe.sh | 6 +++---
recipes/openjazz/recipe.sh | 6 +++---
recipes/openssl/recipe.sh | 6 +++---
recipes/openttd/recipe.sh | 6 +++---
recipes/osdemo/recipe.sh | 2 +-
recipes/pango/recipe.sh | 6 +++---
recipes/patch/recipe.sh | 6 +++---
recipes/pcre/recipe.sh | 6 +++---
recipes/perl/recipe.sh | 6 +++---
recipes/pixman/recipe.sh | 6 +++---
recipes/pkg-config/recipe.sh | 6 +++---
recipes/prboom/recipe.sh | 6 +++---
recipes/python/recipe.sh | 6 +++---
recipes/qemu/recipe.sh | 6 +++---
recipes/readline/recipe.sh | 6 +++---
recipes/relibc-tests/recipe.sh | 2 +-
recipes/relibc/recipe.sh | 4 ++--
recipes/rust/recipe.sh | 2 +-
recipes/schismtracker/recipe.sh | 6 +++---
recipes/scummvm/recipe.sh | 6 +++---
recipes/sdl-player/recipe.sh | 4 ++--
recipes/sdl/recipe.sh | 6 +++---
recipes/sdl2/recipe.sh | 6 +++---
recipes/sdl2_image/recipe.sh | 6 +++---
recipes/sdl2_mixer/recipe.sh | 6 +++---
recipes/sdl2_ttf/recipe.sh | 6 +++---
recipes/sdl_gfx/recipe.sh | 6 +++---
recipes/sdl_image/recipe.sh | 6 +++---
recipes/sdl_mixer/recipe.sh | 6 +++---
recipes/sdl_ttf/recipe.sh | 6 +++---
recipes/sed/recipe.sh | 6 +++---
recipes/shared-mime-info/recipe.sh | 4 ++--
recipes/sopwith/recipe.sh | 6 +++---
recipes/ssh/recipe.sh | 6 +++---
recipes/syobonaction/recipe.sh | 4 ++--
recipes/timidity/recipe.sh | 6 +++---
recipes/vice/recipe.sh | 6 +++---
recipes/vim/recipe.sh | 6 +++---
recipes/vttest/recipe.sh | 6 +++---
recipes/vvvvvv/recipe.sh | 2 +-
recipes/wesnoth/recipe.sh | 2 +-
recipes/xz/recipe.sh | 6 +++---
recipes/zlib/recipe.sh | 6 +++---
105 files changed, 289 insertions(+), 282 deletions(-)
diff --git a/config.sh b/config.sh
index 752a910c2..4dc41ba33 100755
--- a/config.sh
+++ b/config.sh
@@ -32,7 +32,7 @@ BUILD="$(cc -dumpmachine)"
export PKG_CONFIG_FOR_BUILD="pkg-config"
-if [[ "$OSTYPE" == "darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]] || [[ "$OSTYPE" == "FreeBSD" ]]; then
# GNU find
FIND="gfind";
@@ -42,6 +42,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
elif [ ! -z "$(which port)" ]; then
# TODO: find a programatic way of asking MacPorts for it's root dir.
STAT="/opt/local/opt/coreutils/libexec/gnubin/stat";
+ elif [ ! -z "$(which pkg)" ]; then
+ STAT="gnustat"
else
echo "Please install either Homebrew or MacPorts and run the boostrap script."
exit 1
diff --git a/cook.sh b/cook.sh
index dfaa5851e..ce062f02d 100755
--- a/cook.sh
+++ b/cook.sh
@@ -13,6 +13,11 @@ export DEBUG=
export EXAMPLES=
export PREPARE_COPY=1
+SHASUM="sha256sum"
+if hash shasum 2>/dev/null; then
+ SHASUM="shasum -a 256"
+fi
+
if [ ! "$(uname -s)" = "Redox" ]
then
function docgen {
@@ -96,7 +101,7 @@ function op {
if [ -n "$TAR_SHA256" ]
then
- sha256sum -c <<< "${TAR_SHA256} source.tar"
+ $SHASUM -c <<< "${TAR_SHA256} source.tar"
fi
if [ ! -d source ]
@@ -470,7 +475,7 @@ function op {
pushd stage > /dev/null
find -L . -type f | cut -d / -f 2- | sort | while read file
do
- sha256sum "$file" >> "pkg/$1.sha256sums"
+ $SHASUM "$file" >> "pkg/$1.sha256sums"
done
popd > /dev/null
diff --git a/recipes/atk/recipe.sh b/recipes/atk/recipe.sh
index 60fd34843..da84b8e7d 100755
--- a/recipes/atk/recipe.sh
+++ b/recipes/atk/recipe.sh
@@ -25,7 +25,7 @@ function recipe_build {
--prefix=/ \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -35,13 +35,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/autoconf/recipe.sh b/recipes/autoconf/recipe.sh
index 2c703e47d..96fbf5d22 100644
--- a/recipes/autoconf/recipe.sh
+++ b/recipes/autoconf/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
./configure --build=${BUILD} --host=${HOST} --prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,12 +24,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh
index 3731ad312..b008fc600 100644
--- a/recipes/automake/recipe.sh
+++ b/recipes/automake/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
sed -i 's|install-info-am install-man|install-info-am|' Makefile.in
./configure --build=${BUILD} --host=${HOST} --prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -27,12 +27,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/bash/recipe.sh b/recipes/bash/recipe.sh
index b4ec7805a..2c8a2767e 100644
--- a/recipes/bash/recipe.sh
+++ b/recipes/bash/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--prefix=/ \
--disable-readline \
bash_cv_getenv_redef=no
- make # -j"$(nproc)"
+ $REDOX_MAKE # -j"$($NPROC)"
skip=1
}
@@ -33,12 +33,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" ${MAKEFLAGS} install
+ $REDOX_MAKE DESTDIR="$dest" ${MAKEFLAGS} install
skip=1
}
diff --git a/recipes/bootloader/recipe.sh b/recipes/bootloader/recipe.sh
index 6f9a14a2f..14aed1feb 100644
--- a/recipes/bootloader/recipe.sh
+++ b/recipes/bootloader/recipe.sh
@@ -21,7 +21,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/cairo/recipe.sh b/recipes/cairo/recipe.sh
index f054b88fc..54deb8cb1 100755
--- a/recipes/cairo/recipe.sh
+++ b/recipes/cairo/recipe.sh
@@ -27,7 +27,7 @@ function recipe_build {
--enable-xlib=no \
--enable-script=no \
--enable-interpreter=no
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -37,13 +37,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/cairodemo/recipe.sh b/recipes/cairodemo/recipe.sh
index f35d2c20f..2e6976526 100755
--- a/recipes/cairodemo/recipe.sh
+++ b/recipes/cairodemo/recipe.sh
@@ -32,7 +32,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh
index 3f2b89a67..f5b504917 100644
--- a/recipes/cmatrix/recipe.sh
+++ b/recipes/cmatrix/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--prefix=/ \
--without-fonts
sed -i'' -e 's|#define USE_TIOCSTI 1|/* #undef USE_TIOCSTI */|g' config.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,12 +33,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index 98b388e13..51919803c 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -36,7 +36,7 @@ function recipe_build {
--with-nghttp2="$sysroot" \
--with-ssl="$sysroot" \
--with-zlib="$sysroot"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -46,13 +46,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/dash/recipe.sh b/recipes/dash/recipe.sh
index a0974a6ba..5df401add 100644
--- a/recipes/dash/recipe.sh
+++ b/recipes/dash/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
# See https://stackoverflow.com/questions/4247068/sed-command-with-i-option-failing-on-mac-but-works-on-linux.
sed -i'' -e 's|#define HAVE_GETRLIMIT 1|/* #undef HAVE_GETRLIMIT */|g' config.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -32,13 +32,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
ln -s "dash" "$dest/bin/sh"
skip=1
}
diff --git a/recipes/diffutils/recipe.sh b/recipes/diffutils/recipe.sh
index c33902e78..2568e48a8 100644
--- a/recipes/diffutils/recipe.sh
+++ b/recipes/diffutils/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
gt_cv_locale_ja=false \
gt_cv_locale_tr_utf8=false \
gt_cv_locale_zh_CN=false
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,13 +33,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
${HOST}-strip "$dest"/bin/*
rm -rf "$dest"/{lib,share}
skip=1
diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh
index be1b34ea8..845bdb89e 100644
--- a/recipes/dosbox/recipe.sh
+++ b/recipes/dosbox/recipe.sh
@@ -26,7 +26,7 @@ function recipe_build {
--disable-opengl \
--disable-sdltest \
--with-sdl-prefix="$sysroot"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -36,12 +36,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/duktape/recipe.sh b/recipes/duktape/recipe.sh
index 632e94302..d25602286 100644
--- a/recipes/duktape/recipe.sh
+++ b/recipes/duktape/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
function recipe_build {
sed -i "s/= gcc/= $TARGET-gcc/g" Makefile.cmdline
- make -f Makefile.cmdline -j"$(nproc)"
+ $REDOX_MAKE -f Makefile.cmdline -j"$($NPROC)"
skip=1
}
@@ -23,7 +23,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/eduke32/recipe.sh b/recipes/eduke32/recipe.sh
index f43d65254..72595dc75 100644
--- a/recipes/eduke32/recipe.sh
+++ b/recipes/eduke32/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib -static"
export SDLCONFIG="$sysroot/bin/sdl-config --prefix=$sysroot"
- PLATFORM=REDOX make -j"$(nproc)"
+ PLATFORM=REDOX $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,7 +28,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/expat/recipe.sh b/recipes/expat/recipe.sh
index 65a48648c..68b9f60a8 100644
--- a/recipes/expat/recipe.sh
+++ b/recipes/expat/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
export LDFLAGS="--static"
./configure --build=${BUILD} --host=${HOST} --prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,13 +24,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh
index af1a18f76..de5ea97a8 100644
--- a/recipes/ffmpeg/recipe.sh
+++ b/recipes/ffmpeg/recipe.sh
@@ -27,7 +27,7 @@ function recipe_build {
--enable-zlib \
--enable-encoder=png \
--enable-decoder=png
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -37,12 +37,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/fontconfig/recipe.sh b/recipes/fontconfig/recipe.sh
index eba97cc83..8c4590612 100755
--- a/recipes/fontconfig/recipe.sh
+++ b/recipes/fontconfig/recipe.sh
@@ -24,7 +24,7 @@ function recipe_build {
--disable-shared \
--enable-static \
ac_cv_func_XML_SetDoctypeDeclHandler=yes
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -34,13 +34,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh
index 47dd5e6d5..48aa19a79 100644
--- a/recipes/freeciv/recipe.sh
+++ b/recipes/freeciv/recipe.sh
@@ -30,7 +30,7 @@ function recipe_build {
ac_cv_lib_SDL_image_IMG_Load=yes \
ac_cv_lib_SDL_ttf_TTF_OpenFont=yes \
ac_cv_lib_SDL_gfx_rotozoomSurface=yes
- make -j"$(nproc)" V=1
+ $REDOX_MAKE -j"$($NPROC)" V=1
skip=1
}
@@ -40,12 +40,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/freeglut/recipe.sh b/recipes/freeglut/recipe.sh
index 3108f2088..810883e42 100644
--- a/recipes/freeglut/recipe.sh
+++ b/recipes/freeglut/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
-D FREEGLUT_GLES=0 \
.
#./configure --host="${HOST}" --prefix=/ --enable-osmesa
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,12 +33,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/freetype/recipe.sh b/recipes/freetype/recipe.sh
index ea6744f45..e150fe014 100644
--- a/recipes/freetype/recipe.sh
+++ b/recipes/freetype/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
./configure --build=${BUILD} --host=${HOST} --prefix='/'
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -27,13 +27,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/fribidi/recipe.sh b/recipes/fribidi/recipe.sh
index 6d28b967f..4ed952c08 100755
--- a/recipes/fribidi/recipe.sh
+++ b/recipes/fribidi/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--disable-shared \
--enable-static
sed -i 's|#define HAVE_SYS_TIMES_H 1|/* #undef HAVE_SYS_TIMES_H */|g' config.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,13 +33,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/gawk/recipe.sh b/recipes/gawk/recipe.sh
index 98e4c08f9..5f57628b4 100644
--- a/recipes/gawk/recipe.sh
+++ b/recipes/gawk/recipe.sh
@@ -9,7 +9,7 @@ function recipe_update {
function recipe_build {
./configure --build=${BUILD} --host=${HOST} --prefix=/ ac_cv_func_gethostbyname=no ac_cv_func_connect=no
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -19,12 +19,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh
index 5c7d863a4..56ac71cbd 100644
--- a/recipes/gcc/recipe.sh
+++ b/recipes/gcc/recipe.sh
@@ -40,7 +40,7 @@ function recipe_build {
--disable-nls \
--enable-languages=c,c++ \
--enable-threads=posix
- make -j "$(nproc)" all-gcc all-target-libgcc all-target-libstdc++-v3
+ $REDOX_MAKE -j "$(nproc)" all-gcc all-target-libgcc all-target-libstdc++-v3
skip=1
}
@@ -50,13 +50,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install-gcc install-target-libgcc install-target-libstdc++-v3
+ $REDOX_MAKE DESTDIR="$dest" install-gcc install-target-libgcc install-target-libstdc++-v3
find "$dest"/{bin,libexec} -exec $STRIP {} ';' 2> /dev/null
ln -s "gcc" "$1/bin/cc"
skip=1
diff --git a/recipes/gdk-pixbuf/recipe.sh b/recipes/gdk-pixbuf/recipe.sh
index e6dfb00d7..e47210c3a 100755
--- a/recipes/gdk-pixbuf/recipe.sh
+++ b/recipes/gdk-pixbuf/recipe.sh
@@ -68,7 +68,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh
index d6e1f5aef..bf13b41c5 100644
--- a/recipes/gears/recipe.sh
+++ b/recipes/gears/recipe.sh
@@ -30,7 +30,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/gettext/recipe.sh b/recipes/gettext/recipe.sh
index dfcbf9200..2e31ff247 100644
--- a/recipes/gettext/recipe.sh
+++ b/recipes/gettext/recipe.sh
@@ -29,7 +29,7 @@ function recipe_build {
gt_cv_locale_ja=false \
gt_cv_locale_tr_utf8=false \
gt_cv_locale_zh_CN=false
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -39,13 +39,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/gigalomania/recipe.sh b/recipes/gigalomania/recipe.sh
index 768365a2f..2a3d295bc 100644
--- a/recipes/gigalomania/recipe.sh
+++ b/recipes/gigalomania/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
- make all -j"$(nproc)"
+ $REDOX_MAKE all -j"$($NPROC)"
skip=1
}
@@ -28,7 +28,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
@@ -36,7 +36,7 @@ function recipe_stage {
dest="$(realpath $1)"
bundledir="$dest/bundle"
- make VERBOSE=1 DESTDIR="$dest" install
+ $REDOX_MAKE VERBOSE=1 DESTDIR="$dest" install
rm -rf "$bundledir"
skip=1
}
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index 728f71f87..b985b7e6d 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -39,7 +39,7 @@ function recipe_build {
ac_cv_fread_reads_directories=yes \
ac_cv_snprintf_returns_bogus=yes \
ac_cv_lib_curl_curl_global_init=yes
- make "${MAKEFLAGS[@]}" -j"$(nproc)"
+ $REDOX_MAKE "${MAKEFLAGS[@]}" -j"$($NPROC)"
skip=1
}
@@ -49,13 +49,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" "${MAKEFLAGS[@]}" install
+ $REDOX_MAKE DESTDIR="$dest" "${MAKEFLAGS[@]}" install
${STRIP} $1/bin/* || true
${STRIP} $1/libexec/git-core/* || true
rm -rf $1/share/man
diff --git a/recipes/glib/recipe.sh b/recipes/glib/recipe.sh
index ac105727f..8522bdc0d 100644
--- a/recipes/glib/recipe.sh
+++ b/recipes/glib/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--disable-shared \
--enable-static
sed -i 's/#define HAVE_SYS_RESOURCE_H 1/#undef HAVE_SYS_RESOURCE_H/' config.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,13 +33,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/gnu-binutils/recipe.sh b/recipes/gnu-binutils/recipe.sh
index 717cf7464..f16f944b9 100644
--- a/recipes/gnu-binutils/recipe.sh
+++ b/recipes/gnu-binutils/recipe.sh
@@ -29,7 +29,7 @@ function recipe_build {
--disable-gdb \
--disable-nls \
--disable-werror
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -39,13 +39,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
find "$dest/bin" -exec $STRIP {} ';' 2> /dev/null
skip=1
}
diff --git a/recipes/gnu-grep/recipe.sh b/recipes/gnu-grep/recipe.sh
index 691bb7c1d..5768da28b 100644
--- a/recipes/gnu-grep/recipe.sh
+++ b/recipes/gnu-grep/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
export LDFLAGS="-static"
./configure --build=${BUILD} --host=${HOST} --prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,13 +24,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
$HOST-strip "$1"/bin/grep
rm -rf "$1"/{lib,share}
skip=1
diff --git a/recipes/gnu-make/recipe.sh b/recipes/gnu-make/recipe.sh
index 35be95aba..085f82aca 100644
--- a/recipes/gnu-make/recipe.sh
+++ b/recipes/gnu-make/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
--host=${HOST} \
--prefix=/ \
--without-guile
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,12 +29,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/gstreamer/recipe.sh b/recipes/gstreamer/recipe.sh
index 9cf1a3e5a..0d30ad140 100644
--- a/recipes/gstreamer/recipe.sh
+++ b/recipes/gstreamer/recipe.sh
@@ -27,7 +27,7 @@ function recipe_build {
--disable-benchmarks \
--disable-examples \
--disable-tests
- make -j"$(nproc)" V=1
+ $REDOX_MAKE -j"$($NPROC)" V=1
skip=1
}
@@ -37,13 +37,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
index 0b3980bf6..5fdada614 100644
--- a/recipes/harfbuzz/recipe.sh
+++ b/recipes/harfbuzz/recipe.sh
@@ -28,7 +28,7 @@ function recipe_build {
--with-glib=yes \
--with-freetype=yes \
--with-icu=no
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -38,13 +38,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/jansson/recipe.sh b/recipes/jansson/recipe.sh
index 9cd618aa5..d0dd49cbc 100644
--- a/recipes/jansson/recipe.sh
+++ b/recipes/jansson/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
./configure --build=${BUILD} --host=${HOST} --prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -26,12 +26,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/kernel/recipe.sh b/recipes/kernel/recipe.sh
index a877f5d14..162703cbb 100644
--- a/recipes/kernel/recipe.sh
+++ b/recipes/kernel/recipe.sh
@@ -35,7 +35,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/libc-bench/recipe.sh b/recipes/libc-bench/recipe.sh
index a136c82ca..441a3cdc3 100644
--- a/recipes/libc-bench/recipe.sh
+++ b/recipes/libc-bench/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
}
function recipe_build {
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -22,7 +22,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/libffi/recipe.sh b/recipes/libffi/recipe.sh
index ce7b65062..8fcfdb8a0 100644
--- a/recipes/libffi/recipe.sh
+++ b/recipes/libffi/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--prefix=/ \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,13 +33,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/libiconv/recipe.sh b/recipes/libiconv/recipe.sh
index 128294151..c171111c6 100644
--- a/recipes/libiconv/recipe.sh
+++ b/recipes/libiconv/recipe.sh
@@ -20,7 +20,7 @@ function recipe_build {
--disable-shared \
--enable-static \
ac_cv_have_decl_program_invocation_name=no
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -30,13 +30,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/libjpeg/recipe.sh b/recipes/libjpeg/recipe.sh
index f37b0c343..fe92adf20 100644
--- a/recipes/libjpeg/recipe.sh
+++ b/recipes/libjpeg/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
export LDFLAGS="--static"
./configure --build=${BUILD} --host=${HOST} --prefix='/'
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,13 +24,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/libogg/recipe.sh b/recipes/libogg/recipe.sh
index e27dbd204..6c2ecfb52 100644
--- a/recipes/libogg/recipe.sh
+++ b/recipes/libogg/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
--build=${BUILD} \
--host=${HOST} \
--prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/liborbital/recipe.sh b/recipes/liborbital/recipe.sh
index 7896aaecb..de9d0ec12 100644
--- a/recipes/liborbital/recipe.sh
+++ b/recipes/liborbital/recipe.sh
@@ -2,6 +2,6 @@ GIT=https://gitlab.redox-os.org/redox-os/liborbital.git
function recipe_stage {
dest="$(realpath $1)"
- make HOST="$HOST" DESTDIR="$dest" install
+ $REDOX_MAKE HOST="$HOST" DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/libpng/recipe.sh b/recipes/libpng/recipe.sh
index 6d9f93cf9..0cd5d4b96 100644
--- a/recipes/libpng/recipe.sh
+++ b/recipes/libpng/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
chmod +w config.sub
wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
./configure --build=${BUILD} --host=${HOST} --prefix='/'
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/bin/"*-config "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/libsodium/recipe.sh b/recipes/libsodium/recipe.sh
index ce7a4c821..7884d783d 100644
--- a/recipes/libsodium/recipe.sh
+++ b/recipes/libsodium/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
./autogen.sh
./configure --build=${BUILD} --host=${HOST} --prefix='/'
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,12 +24,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/libvorbis/recipe.sh b/recipes/libvorbis/recipe.sh
index b5ccafd00..540d7ab5c 100644
--- a/recipes/libvorbis/recipe.sh
+++ b/recipes/libvorbis/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
--build=${BUILD} \
--host=${HOST} \
--prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,13 +28,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/libxml2/recipe.sh b/recipes/libxml2/recipe.sh
index bf3eed4b0..cba66e014 100755
--- a/recipes/libxml2/recipe.sh
+++ b/recipes/libxml2/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--disable-shared \
--enable-static \
--without-python
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,13 +33,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/llvm/recipe.sh b/recipes/llvm/recipe.sh
index 923f9b182..2ea030baa 100644
--- a/recipes/llvm/recipe.sh
+++ b/recipes/llvm/recipe.sh
@@ -63,7 +63,7 @@ function recipe_build {
)
set -x
cmake "${CMAKE_ARGS[@]}" "$source"
- make -j$(nproc)
+ $REDOX_MAKE -j$(nproc)
set +x
skip=1
}
@@ -74,13 +74,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
find "$dest"/bin -exec $STRIP {} ';' 2> /dev/null
skip=1
}
diff --git a/recipes/lua/recipe.sh b/recipes/lua/recipe.sh
index a24d9c088..4501a4bca 100644
--- a/recipes/lua/recipe.sh
+++ b/recipes/lua/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
}
function recipe_build {
- make generic CC="${HOST}-gcc -std=gnu99" -j"$(nproc)"
+ $REDOX_MAKE generic CC="${HOST}-gcc -std=gnu99" -j"$($NPROC)"
skip=1
}
@@ -22,7 +22,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/mdp/recipe.sh b/recipes/mdp/recipe.sh
index 006a7e9f3..9a84cf065 100644
--- a/recipes/mdp/recipe.sh
+++ b/recipes/mdp/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export CFLAGS="-I$sysroot/include -I$sysroot/include/ncursesw"
export LDFLAGS="-L$sysroot/lib"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -26,12 +26,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" PREFIX="" install
+ $REDOX_MAKE DESTDIR="$dest" PREFIX="" install
skip=1
}
diff --git a/recipes/mesa/recipe.sh b/recipes/mesa/recipe.sh
index 38a7a6307..031dd8819 100644
--- a/recipes/mesa/recipe.sh
+++ b/recipes/mesa/recipe.sh
@@ -37,7 +37,7 @@ function recipe_build {
--enable-static \
--with-gallium-drivers=swrast \
--with-platforms=surfaceless
- make V=1 -j"$(nproc)"
+ $REDOX_MAKE V=1 -j"$($NPROC)"
skip=1
}
@@ -47,14 +47,14 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
#export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/mesa_glu/recipe.sh b/recipes/mesa_glu/recipe.sh
index 5bb291134..183d4772d 100644
--- a/recipes/mesa_glu/recipe.sh
+++ b/recipes/mesa_glu/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
./configure --build=${BUILD} --host="${HOST}" --prefix=/ --enable-osmesa
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/mgba/recipe.sh b/recipes/mgba/recipe.sh
index e4da44bde..ae0e0eb17 100644
--- a/recipes/mgba/recipe.sh
+++ b/recipes/mgba/recipe.sh
@@ -31,7 +31,7 @@ function recipe_build {
-DSDL_VERSION="1.2" \
-DSDL_LIBRARY="-lSDL -lorbital" \
..
- VERBOSE=1 make all -j"$(nproc)"
+ VERBOSE=1 $REDOX_MAKE all -j"$($NPROC)"
skip=1
}
@@ -41,7 +41,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/nasm/recipe.sh b/recipes/nasm/recipe.sh
index 07b6db6c5..0707da013 100644
--- a/recipes/nasm/recipe.sh
+++ b/recipes/nasm/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
export LDFLAGS="-static"
./configure --build=${BUILD} --host=${HOST} --prefix=""
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,13 +24,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make install DESTDIR="$dest"
+ $REDOX_MAKE install DESTDIR="$dest"
find "$dest"/bin -exec ${HOST}-strip {} ';' 2> /dev/null
skip=1
}
diff --git a/recipes/ncdu/recipe.sh b/recipes/ncdu/recipe.sh
index 55f3e3683..d4dbbb442 100644
--- a/recipes/ncdu/recipe.sh
+++ b/recipes/ncdu/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
--build=${BUILD} \
--host="$HOST" \
--prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
function recipe_test {
@@ -27,11 +27,11 @@ function recipe_test {
skip=1
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath "$1")"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh
index 6add4429e..99d1849b3 100644
--- a/recipes/ncurses/recipe.sh
+++ b/recipes/ncurses/recipe.sh
@@ -21,7 +21,7 @@ function recipe_build {
--without-ada \
--without-tests \
cf_cv_func_mkstemp=yes
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -31,13 +31,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$1"/bin
rm -rf "$1"/share/{doc,info,man}
skip=1
diff --git a/recipes/ncursesw/recipe.sh b/recipes/ncursesw/recipe.sh
index e2ab53f4f..866d85ed3 100644
--- a/recipes/ncursesw/recipe.sh
+++ b/recipes/ncursesw/recipe.sh
@@ -15,7 +15,7 @@ function recipe_update {
function recipe_build {
export CPPFLAGS="-P"
./configure --build=${BUILD} --host=${HOST} --prefix="" --enable-widec --disable-db-install
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -25,13 +25,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$1"/bin
rm -rf "$1"/share/{doc,info,man}
skip=1
diff --git a/recipes/netsurf/recipe.sh b/recipes/netsurf/recipe.sh
index 898ac433e..07cd91eca 100644
--- a/recipes/netsurf/recipe.sh
+++ b/recipes/netsurf/recipe.sh
@@ -20,7 +20,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib -L${PWD}/inst-${TARGET}/lib -static -Wl,--allow-multiple-definition -Wl,-Bstatic"
# nghttp2 is not linked for some reason
export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
- make V=1 -j"$(nproc)"
+ $REDOX_MAKE V=1 -j"$($NPROC)"
skip=1
}
@@ -30,13 +30,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
mkdir -pv "$dest/ui/apps"
cp -v ../manifest "$dest/ui/apps/00_netsurf"
skip=1
diff --git a/recipes/neverball/recipe.sh b/recipes/neverball/recipe.sh
index 3a0b40a16..0b60264bd 100644
--- a/recipes/neverball/recipe.sh
+++ b/recipes/neverball/recipe.sh
@@ -14,12 +14,12 @@ function recipe_update {
function recipe_build {
env -i PATH=/usr/bin:/bin PKG_CONFIG=pkg-config \
- make -j"$(nproc)" ENABLE_FS=stdio mapc sols
+ $REDOX_MAKE -j"$($NPROC)" ENABLE_FS=stdio mapc sols
sysroot="$(realpath ../sysroot)"
export CPPFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib -static"
- make -j"$(nproc)" ENABLE_FS=stdio ENABLE_NLS=0 clean-src
- make -j"$(nproc)" ENABLE_FS=stdio ENABLE_NLS=0 neverball neverputt
+ $REDOX_MAKE -j"$($NPROC)" ENABLE_FS=stdio ENABLE_NLS=0 clean-src
+ $REDOX_MAKE -j"$($NPROC)" ENABLE_FS=stdio ENABLE_NLS=0 neverball neverputt
skip=1
}
@@ -29,7 +29,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/newlib/recipe.sh b/recipes/newlib/recipe.sh
index 36e79bd4e..5270cc06a 100644
--- a/recipes/newlib/recipe.sh
+++ b/recipes/newlib/recipe.sh
@@ -25,7 +25,7 @@ function recipe_build {
popd
CC= ./configure --build=${BUILD} --target="${HOST}" --prefix=/
- make all -j"$(nproc)"
+ $REDOX_MAKE all -j"$($NPROC)"
skip=1
}
@@ -36,13 +36,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
cd "$dest"
mv $HOST/* ./
rmdir $HOST
diff --git a/recipes/newlibtest/recipe.sh b/recipes/newlibtest/recipe.sh
index d1d549d9d..23cc6a2b0 100644
--- a/recipes/newlibtest/recipe.sh
+++ b/recipes/newlibtest/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
export CFLAGS="-static -nostdinc -I $sysroot/include -I /usr/lib/gcc/x86_64-unknown-redox/7.0.1/include/ -nostdlib -L $sysroot/lib"
export CRT="$sysroot/lib/crt0.o"
export CLIBS="-lc"
- make all -j"$(nproc)"
+ $REDOX_MAKE all -j"$($NPROC)"
skip=1
}
@@ -26,12 +26,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" prefix=/ install
+ $REDOX_MAKE DESTDIR="$dest" prefix=/ install
skip=1
}
diff --git a/recipes/nghttp2/recipe.sh b/recipes/nghttp2/recipe.sh
index 7b1325c4f..95e921d16 100644
--- a/recipes/nghttp2/recipe.sh
+++ b/recipes/nghttp2/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
--host="${HOST}" \
--prefix=/ \
--enable-lib-only
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make install DESTDIR="$dest"
+ $REDOX_MAKE install DESTDIR="$dest"
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/openjazz/recipe.sh b/recipes/openjazz/recipe.sh
index 3ccda9877..cc201d0c8 100644
--- a/recipes/openjazz/recipe.sh
+++ b/recipes/openjazz/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
autoconf
wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
./configure --build=${BUILD} --host=${HOST} --prefix=''
- make -j"$(nproc)" V=1
+ $REDOX_MAKE -j"$($NPROC)" V=1
skip=1
}
@@ -32,12 +32,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh
index b51b66809..58291a37e 100644
--- a/recipes/openssl/recipe.sh
+++ b/recipes/openssl/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
./Configure no-shared no-dgram redox-$ARCH --prefix="/"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,13 +24,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$1/{share,ssl}"
skip=1
}
diff --git a/recipes/openttd/recipe.sh b/recipes/openttd/recipe.sh
index ba6452407..f5a48fa29 100644
--- a/recipes/openttd/recipe.sh
+++ b/recipes/openttd/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
--without-liblzo2 \
--disable-network \
--without-threads
- make VERBOSE=1 -j"$(nproc)"
+ $REDOX_MAKE VERBOSE=1 -j"$($NPROC)"
skip=1
}
@@ -32,7 +32,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
@@ -40,7 +40,7 @@ function recipe_stage {
dest="$(realpath $1)"
bundledir="$dest/bundle"
- make VERBOSE=1 ROOT_DIR="$dest/../build/" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest" install
+ $REDOX_MAKE VERBOSE=1 ROOT_DIR="$dest/../build/" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest" install
rm -rf "$bundledir"
skip=1
}
diff --git a/recipes/osdemo/recipe.sh b/recipes/osdemo/recipe.sh
index c32f72a00..ef49d8773 100644
--- a/recipes/osdemo/recipe.sh
+++ b/recipes/osdemo/recipe.sh
@@ -30,7 +30,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/pango/recipe.sh b/recipes/pango/recipe.sh
index 55de27dea..bd2997a7e 100755
--- a/recipes/pango/recipe.sh
+++ b/recipes/pango/recipe.sh
@@ -24,7 +24,7 @@ function recipe_build {
--prefix=/ \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -34,13 +34,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/patch/recipe.sh b/recipes/patch/recipe.sh
index b0c6a791a..8e5a2f9e8 100644
--- a/recipes/patch/recipe.sh
+++ b/recipes/patch/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
autoreconf
./configure --build=${BUILD} --host=${HOST} --prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -26,13 +26,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
$HOST-strip $1/bin/*
rm -rf "$1/"{share,lib}
skip=1
diff --git a/recipes/pcre/recipe.sh b/recipes/pcre/recipe.sh
index b6f3df1b0..e39f4f22d 100644
--- a/recipes/pcre/recipe.sh
+++ b/recipes/pcre/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
--prefix=/ \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -32,13 +32,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/perl/recipe.sh b/recipes/perl/recipe.sh
index b4bd646af..c780b5f9f 100644
--- a/recipes/perl/recipe.sh
+++ b/recipes/perl/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
sed -i "s/^#define Netdb_name_t.*/#define Netdb_name_t const char*/" config.h # XXX
sed -i 's/#define Strerror(e).*$/#define Strerror(e) strerror(e)/' config.h #
echo "#define HAS_VPRINTF" >> config.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -32,13 +32,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$1/man"
skip=1
}
diff --git a/recipes/pixman/recipe.sh b/recipes/pixman/recipe.sh
index 593380561..64d87a417 100755
--- a/recipes/pixman/recipe.sh
+++ b/recipes/pixman/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
--prefix=/ \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/pkg-config/recipe.sh b/recipes/pkg-config/recipe.sh
index 6f514dae0..0a5a208b7 100755
--- a/recipes/pkg-config/recipe.sh
+++ b/recipes/pkg-config/recipe.sh
@@ -21,7 +21,7 @@ function recipe_build {
--prefix="" \
--disable-shared \
--enable-static
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -31,13 +31,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
export DESTDIR="$(realpath $1)"
- make install
+ $REDOX_MAKE install
rm -f "${DESTDIR}/lib/"*.la
skip=1
}
diff --git a/recipes/prboom/recipe.sh b/recipes/prboom/recipe.sh
index 678437918..8827ec2f3 100644
--- a/recipes/prboom/recipe.sh
+++ b/recipes/prboom/recipe.sh
@@ -26,7 +26,7 @@ function recipe_build {
--disable-gl \
--without-net \
--with-sdl-prefix="$sysroot"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -36,12 +36,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
index 7a024f103..f0a87ab75 100644
--- a/recipes/python/recipe.sh
+++ b/recipes/python/recipe.sh
@@ -26,7 +26,7 @@ function recipe_build {
sed -i 's|#define HAVE_PTHREAD_KILL 1|/* #undef HAVE_PTHREAD_KILL */|g' pyconfig.h
sed -i 's|#define HAVE_SCHED_SETSCHEDULER 1|/* #undef HAVE_SCHED_SETSCHEDULER */|g' pyconfig.h
sed -i 's|#define HAVE_SYS_RESOURCE_H 1|/* #undef HAVE_SYS_RESOURCE_H */|g' pyconfig.h
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -36,13 +36,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install -j"$(nproc)"
+ $REDOX_MAKE DESTDIR="$dest" install -j"$($NPROC)"
"$STRIP" "$dest/bin/python3.7" "$dest/bin/python3.7m"
skip=1
}
diff --git a/recipes/qemu/recipe.sh b/recipes/qemu/recipe.sh
index 3bb11eb74..d5666cb1e 100644
--- a/recipes/qemu/recipe.sh
+++ b/recipes/qemu/recipe.sh
@@ -21,7 +21,7 @@ function recipe_build {
--build=${BUILD} \
--host="${HOST}" \
--prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -31,14 +31,14 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
#export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/readline/recipe.sh b/recipes/readline/recipe.sh
index d082c0b9c..e3f2b821b 100644
--- a/recipes/readline/recipe.sh
+++ b/recipes/readline/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CFLAGS="-I$sysroot/include"
./configure --disable-shared --build=${BUILD} --host=${HOST} --prefix=""
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -27,13 +27,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$1"/share/{doc,info,man}
skip=1
}
diff --git a/recipes/relibc-tests/recipe.sh b/recipes/relibc-tests/recipe.sh
index 56df01942..bc89e71f8 100644
--- a/recipes/relibc-tests/recipe.sh
+++ b/recipes/relibc-tests/recipe.sh
@@ -1,7 +1,7 @@
GIT=https://gitlab.redox-os.org/redox-os/relibc.git
function recipe_build {
- make CARGO=xargo NATIVE_RELIBC=1 -C tests -j"$(nproc)"
+ $REDOX_MAKE CARGO=xargo NATIVE_RELIBC=1 -C tests -j"$($NPROC)"
skip=1
}
diff --git a/recipes/relibc/recipe.sh b/recipes/relibc/recipe.sh
index 87f665e50..4c561da6a 100644
--- a/recipes/relibc/recipe.sh
+++ b/recipes/relibc/recipe.sh
@@ -1,12 +1,12 @@
GIT=https://gitlab.redox-os.org/redox-os/relibc.git
function recipe_build {
- make CARGO="env -u CARGO xargo" -j"$(nproc)"
+ $REDOX_MAKE CARGO="env -u CARGO xargo" -j"$($NPROC)"
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make CARGO="env -u CARGO xargo" DESTDIR="$dest" install
+ $REDOX_MAKE CARGO="env -u CARGO xargo" DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh
index c5495d09f..02a3fd4e8 100644
--- a/recipes/rust/recipe.sh
+++ b/recipes/rust/recipe.sh
@@ -28,7 +28,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/schismtracker/recipe.sh b/recipes/schismtracker/recipe.sh
index 933d1efdf..3d3813002 100644
--- a/recipes/schismtracker/recipe.sh
+++ b/recipes/schismtracker/recipe.sh
@@ -20,7 +20,7 @@ function recipe_build {
export SDL_CONFIG="$sysroot/bin/sdl-config"
autoreconf -i
./configure --build=${BUILD} --host=${HOST} --prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -30,12 +30,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/scummvm/recipe.sh b/recipes/scummvm/recipe.sh
index e0303fb00..df3b23278 100644
--- a/recipes/scummvm/recipe.sh
+++ b/recipes/scummvm/recipe.sh
@@ -26,7 +26,7 @@ function recipe_build {
--with-zlib-prefix="$sysroot" \
--disable-timidity \
--disable-mt32emu
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -36,12 +36,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/sdl-player/recipe.sh b/recipes/sdl-player/recipe.sh
index 0aedb7f71..4af3a0a11 100644
--- a/recipes/sdl-player/recipe.sh
+++ b/recipes/sdl-player/recipe.sh
@@ -15,7 +15,7 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export CPPFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib -static"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -25,7 +25,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/sdl/recipe.sh b/recipes/sdl/recipe.sh
index 0d9aaed29..250a4055e 100644
--- a/recipes/sdl/recipe.sh
+++ b/recipes/sdl/recipe.sh
@@ -28,7 +28,7 @@ function recipe_build {
--enable-redoxaudio \
--enable-clock_gettime \
--enable-video-orbital
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -38,13 +38,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl2/recipe.sh b/recipes/sdl2/recipe.sh
index f88495518..8b68fe7f4 100644
--- a/recipes/sdl2/recipe.sh
+++ b/recipes/sdl2/recipe.sh
@@ -32,7 +32,7 @@ function recipe_build {
--enable-video-orbital \
--enable-redoxaudio \
--enable-cdrom
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -42,13 +42,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl2_image/recipe.sh b/recipes/sdl2_image/recipe.sh
index 7a52bb28f..1b8ecc888 100644
--- a/recipes/sdl2_image/recipe.sh
+++ b/recipes/sdl2_image/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz -lm -lpthread -lstdc++"
./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest --enable-png --enable-jpg
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,13 +28,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl2_mixer/recipe.sh b/recipes/sdl2_mixer/recipe.sh
index d282e05dd..1f52295c5 100644
--- a/recipes/sdl2_mixer/recipe.sh
+++ b/recipes/sdl2_mixer/recipe.sh
@@ -30,7 +30,7 @@ function recipe_build {
--disable-smpegtest \
--disable-music-midi \
--disable-music-mod
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -40,13 +40,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl2_ttf/recipe.sh b/recipes/sdl2_ttf/recipe.sh
index c1a942b20..203b66acc 100644
--- a/recipes/sdl2_ttf/recipe.sh
+++ b/recipes/sdl2_ttf/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz -lm -lpthread -lstdc++"
./autogen.sh
./configure --prefix=/ --build=${BUILD} --host=${HOST} --enable-opengl --disable-shared --disable-sdltest
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -29,13 +29,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl_gfx/recipe.sh b/recipes/sdl_gfx/recipe.sh
index bc9566e92..4915fbcff 100644
--- a/recipes/sdl_gfx/recipe.sh
+++ b/recipes/sdl_gfx/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
./autogen.sh
./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,13 +28,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl_image/recipe.sh b/recipes/sdl_image/recipe.sh
index c7eefdd7f..2a199e888 100644
--- a/recipes/sdl_image/recipe.sh
+++ b/recipes/sdl_image/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
./autogen.sh
./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest --enable-png --enable-jpg
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,13 +28,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl_mixer/recipe.sh b/recipes/sdl_mixer/recipe.sh
index 072bb1e9e..4dddfc6c5 100644
--- a/recipes/sdl_mixer/recipe.sh
+++ b/recipes/sdl_mixer/recipe.sh
@@ -30,7 +30,7 @@ function recipe_build {
--disable-smpegtest \
--disable-music-midi \
--disable-music-mod
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -40,13 +40,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sdl_ttf/recipe.sh b/recipes/sdl_ttf/recipe.sh
index 07cee556a..dc4f19d6a 100644
--- a/recipes/sdl_ttf/recipe.sh
+++ b/recipes/sdl_ttf/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
./autogen.sh
./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,13 +28,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sed/recipe.sh b/recipes/sed/recipe.sh
index 90105f472..840a0bc94 100644
--- a/recipes/sed/recipe.sh
+++ b/recipes/sed/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
--build=${BUILD} \
--host=${HOST} \
--prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -27,12 +27,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/shared-mime-info/recipe.sh b/recipes/shared-mime-info/recipe.sh
index 936049447..e2f764028 100755
--- a/recipes/shared-mime-info/recipe.sh
+++ b/recipes/shared-mime-info/recipe.sh
@@ -30,13 +30,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -f "$dest/lib/"*.la
skip=1
}
diff --git a/recipes/sopwith/recipe.sh b/recipes/sopwith/recipe.sh
index 4f4603f96..7cc18a06b 100644
--- a/recipes/sopwith/recipe.sh
+++ b/recipes/sopwith/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
--host=${HOST} \
--prefix='' \
--with-sdl-prefix="$sysroot"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -33,12 +33,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/ssh/recipe.sh b/recipes/ssh/recipe.sh
index f21368363..54a1917cb 100644
--- a/recipes/ssh/recipe.sh
+++ b/recipes/ssh/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
./configure --build=${BUILD} --host=${HOST} --prefix=/
- make -j$(nproc)
+ $REDOX_MAKE -j$(nproc)
skip=1
}
@@ -27,12 +27,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/syobonaction/recipe.sh b/recipes/syobonaction/recipe.sh
index f4475d1b9..d50ce4973 100644
--- a/recipes/syobonaction/recipe.sh
+++ b/recipes/syobonaction/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
export SDL_CONFIG="${PKG_CONFIG} sdl"
export CPPFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib"
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -27,7 +27,7 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
diff --git a/recipes/timidity/recipe.sh b/recipes/timidity/recipe.sh
index 3c73161d3..b2f2f5cf8 100644
--- a/recipes/timidity/recipe.sh
+++ b/recipes/timidity/recipe.sh
@@ -22,7 +22,7 @@ function recipe_build {
--host=${HOST} \
--prefix='' \
--enable-vt100
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -32,13 +32,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
mkdir -pv "$1/share/timidity"
echo "soundfont /share/generaluser-gs/generaluser-gs.sf2" >> "$1/share/timidity/timidity.cfg"
diff --git a/recipes/vice/recipe.sh b/recipes/vice/recipe.sh
index 9146c873d..f2b822e55 100644
--- a/recipes/vice/recipe.sh
+++ b/recipes/vice/recipe.sh
@@ -31,7 +31,7 @@ function recipe_build {
--disable-rs232 \
--disable-realdevice \
--disable-midi
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -41,12 +41,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/vim/recipe.sh b/recipes/vim/recipe.sh
index c4f9ae033..f0947359e 100644
--- a/recipes/vim/recipe.sh
+++ b/recipes/vim/recipe.sh
@@ -25,7 +25,7 @@ function recipe_build {
export vim_cv_stat_ignores_slash=yes
export vim_cv_memmove_handles_overlap=yes
./configure --build=${BUILD} --host=${HOST} --prefix=/ --with-tlib=ncurses
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -35,12 +35,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" ${MAKEFLAGS} install
+ $REDOX_MAKE DESTDIR="$dest" ${MAKEFLAGS} install
skip=1
}
diff --git a/recipes/vttest/recipe.sh b/recipes/vttest/recipe.sh
index 8b2b106db..1898c5ebe 100644
--- a/recipes/vttest/recipe.sh
+++ b/recipes/vttest/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
--build=${BUILD} \
--host=${HOST} \
--prefix=''
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -28,12 +28,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
diff --git a/recipes/vvvvvv/recipe.sh b/recipes/vvvvvv/recipe.sh
index 2fe0e19d0..05debb531 100644
--- a/recipes/vvvvvv/recipe.sh
+++ b/recipes/vvvvvv/recipe.sh
@@ -21,7 +21,7 @@ function recipe_build {
-DSDL2_LIBRARIES="-static -lSDL2main -lSDL2_mixer -lSDL2 $("${PKG_CONFIG}" --libs glu) -lglapi -lorbital -lz -lvorbisfile -lvorbis -logg" \
.
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
diff --git a/recipes/wesnoth/recipe.sh b/recipes/wesnoth/recipe.sh
index b258c15b2..407ba87bd 100644
--- a/recipes/wesnoth/recipe.sh
+++ b/recipes/wesnoth/recipe.sh
@@ -49,7 +49,7 @@ function recipe_build {
-DVORBISFILE_INCLUDE_DIR="${sysroot}/include" \
-DVORBISFILE_LIBRARY=vorbisfile \
..
- VERBOSE=1 make all -j"$(nproc)"
+ VERBOSE=1 $REDOX_MAKE all -j"$($NPROC)"
set +x
skip=1
}
diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh
index b82f82407..c136f7f43 100644
--- a/recipes/xz/recipe.sh
+++ b/recipes/xz/recipe.sh
@@ -38,7 +38,7 @@ function recipe_build {
--enable-static=yes \
--enable-threads=no \
--with-pic=no
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -48,13 +48,13 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
rm -rf "$dest/share"
skip=1
}
diff --git a/recipes/zlib/recipe.sh b/recipes/zlib/recipe.sh
index bbe7bd1a5..7bc4c5f03 100644
--- a/recipes/zlib/recipe.sh
+++ b/recipes/zlib/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
function recipe_build {
# See https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar.
CHOST=x86_64-unknown-redox ./configure --static --prefix=/
- make -j"$(nproc)"
+ $REDOX_MAKE -j"$($NPROC)"
skip=1
}
@@ -24,12 +24,12 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ $REDOX_MAKE clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ $REDOX_MAKE DESTDIR="$dest" install
skip=1
}
--
GitLab