diff --git a/config.sh b/config.sh
index 752a910c23ebff3c19df7cacec9a824ed09b4a3a..4dc41ba338d77d0eb878034bcd36db2eb77c33cb 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 dfaa5851e5a4081d7314d2de3240115da65dfc29..ce062f02d4b3725d63724a55789bf2951fa707ce 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 60fd34843d12aae220bcec0d879a522555bf7fa8..da84b8e7d567363b14d7d45f9a532d1f541a5932 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 2c703e47dc8fdee9b322448d71c15807570d43a3..96fbf5d223fb5836f05daa0f45fa625465dfbf0c 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 3731ad3128f17f724bc2616976559f9254ef5431..b008fc600eba6d8a42216c110e3bc4d0f1c62a7a 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 b4ec7805ab211b5bfb80140cbd608b19cdef61db..2c8a2767e01775cb2912c304eee9d1d4b78d35a2 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 6f9a14a2f69d1be9b941f28f50d19ecd7f6b6020..14aed1feb0c4ed15db026fd22f33351c316a09a5 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 f054b88fc22a143c36b3deb6587b94dfd1e92ae2..54deb8cb1756e8a4700cea3e6a7cb0778f0bdfc9 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 f35d2c20fd96f4556a77f54642d3fc6895ca5285..2e6976526c8ff57b529bc74e2824927c774d6207 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 3f2b89a6704d8b4cfcb107a9bbe613e07fcf020f..f5b504917790d4b966a14a5f6c4839df6ab8ce13 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 98b388e13e6f8d1af68849919e693c421c96ee4d..51919803c309e59a4141d816571591f687ed6d44 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 a0974a6baeeaa1c8a3581a623c3831cb39399794..5df401addedc365a9330078b3b77b36d1e4834bc 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 c33902e7891b8ec299f9f5bd946eb7a2fd3dff11..2568e48a87bddd2cbd2b6b93ef60cafbe1bdb145 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 be1b34ea82626772ea522cacf64e42eeb9a896c9..845bdb89e2aef269aceebba2452bb2eb75eabcfe 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 632e943024efbdbeec3c7e0bcaf326d3c6e87a04..d256022869943be66b9c467c091cc4128151881b 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 f43d65254214e7cfca9578550b673a60915cd56a..72595dc75c47ab5babf530f30490c0ca6e13ff81 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 65a48648cb17c9c5e8712289373757b3c98ccc78..68b9f60a87fe828016ce9a0c7b30c630bc947609 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 af1a18f7620ab123a4e67279c42eb4a03310131d..de5ea97a8c6135142b67f37e397fa638d36a48b7 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 eba97cc83ab420720012fa97af9db4e29a282f78..8c4590612a006e7596c8f82a43ae3bc7bafd6fa3 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 47dd5e6d527bc39db50c43967715ecd887d609a4..48aa19a79c9e711b642ca6bee9aa92935a7a0cd5 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 3108f2088fed5e916b5b4d6ec680597b343168c7..810883e4284652a3dd89dc530ec52be673162423 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 ea6744f4564ccb93e78e423afe73b90de52fd950..e150fe014d71b6b84a5f5683c2de818608508f6d 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 6d28b967ff56e21452e27ad9abf763689630b958..4ed952c08c96eb3ee824db85fb8a843bab88e477 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 98e4c08f92f65675f7f6482dc02a8b033b7f6070..5f57628b4b41e03c102000a4da5273ad5e9f1353 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 5c7d863a491b11666a65d36e365c4d914b375b31..56ac71cbdd4acdb4087a93444eab7b0c63d72f8d 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 e6dfb00d74b7dbc16f84d52499466b9b2fc2b4fb..e47210c3a91a3f2030ee8d885c4c2eac89c535ac 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 d6e1f5aef5a426d86151a6459a3978c151fe9738..bf13b41c52dc237157f98dad90c7f8b4237dadcc 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 dfcbf920041c4563bf977828a3d10404668b153a..2e31ff247827707773b20d39658fddabf7902690 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 768365a2f4fc6f47fa99cc6c94b9b22973863797..2a3d295bccd6b502da47b6c7c57d3f20798997ed 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 728f71f8798cceb55511b3ea74ef56d9e9e4a545..b985b7e6d210f908b067ac250d3f3045e372f6ad 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 ac105727f5cfd7453a50ef21fc5960cd0ced068b..8522bdc0d2277f1102d1c2f3398a285dd28c4f0f 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 717cf746403628b90fd8435165a27ac9888031a4..f16f944b9436184c6d7893e4609fc5abd48a97e1 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 691bb7c1dfb4b17f03ea239a7d6d0e6db681af90..5768da28b24852a5b0b9f121536df551e8c0f11f 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 35be95abadaa242d475796fe3fa3db69e54520fb..085f82aca8b1dbab3272c825edf08246cb31bfdf 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 9cf1a3e5a49c7d88b540c7feef86c0be9df296d4..0d30ad1401c44a0e6e67c9821ec51b1aabae749d 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 0b3980bf6d72c3ec123393cf63ebd5efef06ba96..5fdada614f6a2fa5c112dce29213689a50ab20e3 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 9cd618aa5f544561a66dacab0afda08b8f99c2e1..d0dd49cbc0b03035ed0096dce159dd338ffff167 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 a877f5d14497943160b524c1077ec9ecc4b7d26a..162703cbbb3ff5c25fc7ef5ec5f0c663a9431987 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 a136c82ca2e909f74343aafc70ff7c04b785f27f..441a3cdc3a72e89accbedf75bbd19f3940e6de66 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 ce7b6506205c2c831894b82bacb6874420b93053..8fcfdb8a0918def9030d155c8af216372af0a54f 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 1282941511c033ebb0427d9ada5511bcbecdc8f8..c171111c6e4eddf7824362b1d540f354f2836723 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 f37b0c3439651f11d1d05b5f493eddbdab155fee..fe92adf204c0bdc5e6803a34eb37e62b732ccc4e 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 e27dbd204eee8d8eb4db79924a6e2d0aeef6ae5b..6c2ecfb52e5d9734d89f2e6df57674c455948b7a 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 7896aaecbea5f5c41f010177c79879f9bd4a1407..de9d0ec12635d31997c91c87eed0ad46c360dcf9 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 6d9f93cf98e6bceeb98f73d378174ce7c66ea107..0cd5d4b961144ee95f68287070b135e4cc0b79cd 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 ce7a4c821f6170234b76f1d53bfd5aa73b68f287..7884d783db35541bf882eb13d62ee328b8dcefe4 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 b5ccafd00265223a3ca44ad5feaa77acff9befe7..540d7ab5cecdf89f0033edae2a08944f9e668757 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 bf3eed4b0926eca85ed758bc3b66f47ba98a2b6b..cba66e014817547dd22b50b84c70281326b2b4da 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 923f9b182d3168a891c4ddbfbe57d318ff5320d5..2ea030baa4e5633cf27e27c5d9393a22be0b41ac 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 a24d9c088da7f4fbd08d68c1dbf73568047d21a2..4501a4bca06943b6811da431d67f70b2a29ca825 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 006a7e9f366f3cbd6b38cd7236bd50c4b9c83666..9a84cf065cf018faaf2711a46d5d26bf4deb631c 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 38a7a6307ff3f4f54467aee1aa1480d8602826f9..031dd8819d08c4cca64433c703402df34146bf3d 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 5bb2911340cee2c23edd50d3a25a7e59360347c1..183d4772db5f8a4220e99bb790154a800536f5fd 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 e4da44bdeb7d39f4e49d3d2ef99ae19660338397..ae0e0eb17e8da3d05feb8247ed956038aac2fba4 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 07b6db6c58f75e290cd5bca7c1ca210d7ba2d91d..0707da013464cefcb4cde58ddcfc52352fb6760a 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 55f3e3683aa52ffc116e9326e76b455cb7b74640..d4dbbb4426e91617057763d084c47bae4a6577c9 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 6add4429e159fb34dc75e142ce32da77fb7fbf38..99d1849b3a92357a6672e1415eea52e4d30c8700 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 e2ab53f4f72a94e72f97a0de300773bc6e753ebc..866d85ed3e3199fce9072a1d40f66b39af5223e9 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 898ac433e70da9d0b87031683bf4479d4b62efa0..07cd91eca37c0a47b07f445265d224623bd61b37 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 3a0b40a1645abcf2b12d9fe4ea99827f74aba536..0b60264bd11a6bc07be7499dd4a4041d03dde54b 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 36e79bd4e99ae9de8a9c77b89eb93619b0e09558..5270cc06addad5af9f0e6300ad0262db93e48859 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 d1d549d9d8d84b3c429e6babd55a0988731959f4..23cc6a2b0f726598c3c785d10bf979e65548aa33 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 7b1325c4fed2f85a492f6235960e727b69846982..95e921d16fe123eee63a899e4e73e6c3e44409ca 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 3ccda9877d938b85e7367ee1ba535570bb10342b..cc201d0c831490cd28485a4263208180d32c8b05 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 b51b6680937cdc20e1901a2c04532442fac9e374..58291a37ee51e30e26d8aec553af09a50c912cfd 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 ba64524071e8c045d12565c4a6bf2552b7574dca..f5a48fa29119e17ba94504d93fa6686745f3489a 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 c32f72a0039da80a41e8978a699919fb4d435860..ef49d8773a3ae9b784e0d0cb370b67c6e2ba6a10 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 55de27dea3525c435705011bd9dc5ab5b4b0bbfe..bd2997a7e19494edb19c5288eb23edf4f355a898 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 b0c6a791a08f211ea371fab98001ab675de4981a..8e5a2f9e840c6d1731a13353c4628380da7aba35 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 b6f3df1b0cc2eac39640b8f4d8a4811a5d343102..e39f4f22dea082e597000ccac574e88a4eaba803 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 b4bd646af34284d88187c56a31cee1a53b355ce1..c780b5f9fbf6c289a84eb67f7cae5bd2260b4194 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 593380561ce22774b80f28ff859fe6803ba2ae08..64d87a417e53a0468e090a6d6cb6b669ca674e97 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 6f514dae0a7fb73e3455451852264d97d4266bf8..0a5a208b770a7fb198a53a9cc7bc17c76190a505 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 678437918abb1478ef31dcdf0a7fe7f18aa8b75d..8827ec2f3741c5a9d7966e1a71fb7d0668f71ea0 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 7a024f103e81f3f20643a607b3e40224e2e62000..f0a87ab752280fd2ff282963eadc032576e4a30a 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 3bb11eb744364e7d14897d68a9a013a97caa6517..d5666cb1e1c998849e2c4fe8f77ce9ff232ffe07 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 d082c0b9c52303ec8dea8af624276715a090cb7b..e3f2b821b1aa83b19e6168e593d6f867599c1556 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 56df0194276d7f3fc465c8d02f3b99f68cebf865..bc89e71f8bd737d843b6fd4a881fb0f74d579755 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 87f665e50730629e5f49ee1578d580b385a5d172..4c561da6aeee262c62e404329ea321bc115ae443 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 c5495d09f538d63ea0606547c3b9c139eae623c3..02a3fd4e807b27207c76ce656c9cffa4c8ee1df0 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 933d1efdf256a2ff87529b1b201a3226c2b3bec0..3d3813002b1a15af702ca3618a35f85de8422f25 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 e0303fb00330960603f4d3ca60d671867a4c0931..df3b232788cda2b44e83552aeca9fbe558e13c58 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 0aedb7f71d8c6346f385258115723b5e3110c086..4af3a0a11abc04773c6f0cd9d87c190fff022b0b 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 0d9aaed297192fcc8fc24819045a544c255ba765..250a4055e67bcd1aeac368739551e9d9aac394f1 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 f8849551862809c7d540023628cc19da0c870adf..8b68fe7f49ad11b9d0b40118e3ba88761126a427 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 7a52bb28fcffb8d7d0966e72f3688200466bd077..1b8ecc888a23d097a973bddc495eed593aca9f4a 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 d282e05dd3f774a4f248304a466dd91fc91e4fa5..1f52295c5f836bee1cb4509068d3d79894316316 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 c1a942b20bb247cfcb3bacd022ca2335985b5396..203b66accae445947f804eea6b947049f8862fb2 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 bc9566e9281247c8b405cdee3b8d212bd8afc380..4915fbcffe2902df5a174920dc0f87ddd23f8fae 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 c7eefdd7fbfba9fd0d97b50e18e0073667b74431..2a199e8886bd446ac063da70d143755b83278464 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 072bb1e9e5ad251e257e24d34fb6b235106de7e7..4dddfc6c590c850ce72af62c4806a84d3417754a 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 07cee556a8e4c540db65cb591bc08863be33d1e0..dc4f19d6ae475c2bed6d352094d3f2585e0d3ac4 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 90105f472a00ff5482a53b9f15b48b16da28f64b..840a0bc948c2cc0de00a7b7604046fed7db3e44d 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 9360494479bdf631d372cc5494211cf9dad1d5b5..e2f764028aeeb2e1d283205527697f9312394572 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 4f4603f96c5f59fde649790cf6ed2ac0d611c3c0..7cc18a06bf3cbf64c3027b4bb8561f1b3e46a51d 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 f213683630c4d609eb088c6916150cec8a311d35..54a1917cbb893c72903dd3c2dbcd526d817479d8 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 f4475d1b96802c70506aa47514197386b16c0ade..d50ce4973c28d39dc33d1583bc084c3ce9b7a3c8 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 3c73161d3a8084b125939f159592abfe2a53aa7e..b2f2f5cf8ea4a0128997936997f06e8b5983fceb 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 9146c873d6170c36636309f4b995d2536655ef45..f2b822e55efdfff3a87e24221d5fa6f5d998d1e4 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 c4f9ae03328d0a07f229cdfc21748c3a75e95e76..f0947359e300186abd6f3f0b02b8ccadd4184bd4 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 8b2b106dbd41688357bd960773ac46efbc237fcf..1898c5ebe474c44bbcd2f73125e52857bf55b4df 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 2fe0e19d08b89391737e2fa09dbbc06a5d3ff434..05debb5318eff141217239f0f109189b3d82eeb1 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 b258c15b26732d729f74372c12e2b5f3632ed376..407ba87bdf509007cdb933f65b376bef84ea9baf 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 b82f82407f2a65fd8aec1eb6b2083b21d808c2ea..c136f7f431a5baf6a80fdbfb2d938f00b48b2dd7 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 bbe7bd1a528b0c7a6e5d389d7693a209784a3653..7bc4c5f0320dfd48d789cbb83d192519c8e2d142 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
}