From d0e33c53ef244272df3f81c3a7942870d72d1087 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jeremy@system76.com> Date: Wed, 6 May 2020 09:15:18 -0600 Subject: [PATCH] Quote REDOX_MAKE variable --- 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 +++--- 103 files changed, 279 insertions(+), 279 deletions(-) diff --git a/recipes/atk/recipe.sh b/recipes/atk/recipe.sh index da84b8e7d..802853de5 100755 --- a/recipes/atk/recipe.sh +++ b/recipes/atk/recipe.sh @@ -25,7 +25,7 @@ function recipe_build { --prefix=/ \ --disable-shared \ --enable-static - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -35,13 +35,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 96fbf5d22..ff9e0242d 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='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,12 +24,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh index b008fc600..92649e648 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='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -27,12 +27,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/bash/recipe.sh b/recipes/bash/recipe.sh index 2c8a2767e..c0a952e08 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 - $REDOX_MAKE # -j"$($NPROC)" + "$REDOX_MAKE" # -j"$($NPROC)" skip=1 } @@ -33,12 +33,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 14aed1feb..b91ed3e5c 100644 --- a/recipes/bootloader/recipe.sh +++ b/recipes/bootloader/recipe.sh @@ -21,7 +21,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/cairo/recipe.sh b/recipes/cairo/recipe.sh index 54deb8cb1..d20973a32 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -37,13 +37,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 2e6976526..b26b42cf9 100755 --- a/recipes/cairodemo/recipe.sh +++ b/recipes/cairodemo/recipe.sh @@ -32,7 +32,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh index f5b504917..d721f3084 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,12 +33,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh index 51919803c..3222b8e04 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -46,13 +46,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 5df401add..b4e9ee7e3 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -32,13 +32,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 2568e48a8..5d2cc77bd 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,13 +33,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 845bdb89e..e6b121fc1 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -36,12 +36,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/duktape/recipe.sh b/recipes/duktape/recipe.sh index d25602286..5b8ccb92e 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 - $REDOX_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 { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/eduke32/recipe.sh b/recipes/eduke32/recipe.sh index 72595dc75..a67de8d40 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 $REDOX_MAKE -j"$($NPROC)" + PLATFORM=REDOX "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,7 +28,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/expat/recipe.sh b/recipes/expat/recipe.sh index 68b9f60a8..9a0dbaaa8 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=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,13 +24,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 de5ea97a8..4ec760209 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -37,12 +37,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/fontconfig/recipe.sh b/recipes/fontconfig/recipe.sh index 8c4590612..645dd8b67 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -34,13 +34,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 48aa19a79..9caae43ab 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 - $REDOX_MAKE -j"$($NPROC)" V=1 + "$REDOX_MAKE" -j"$($NPROC)" V=1 skip=1 } @@ -40,12 +40,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/freeglut/recipe.sh b/recipes/freeglut/recipe.sh index 810883e42..b95be4cec 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,12 +33,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/freetype/recipe.sh b/recipes/freetype/recipe.sh index e150fe014..ae71650c8 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='/' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -27,13 +27,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 4ed952c08..c48a7309c 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,13 +33,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 5f57628b4..e83aec7b5 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -19,12 +19,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh index 56ac71cbd..c63ecb872 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 - $REDOX_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 { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 e47210c3a..457461dd3 100755 --- a/recipes/gdk-pixbuf/recipe.sh +++ b/recipes/gdk-pixbuf/recipe.sh @@ -68,7 +68,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh index bf13b41c5..ea1114b4d 100644 --- a/recipes/gears/recipe.sh +++ b/recipes/gears/recipe.sh @@ -30,7 +30,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/gettext/recipe.sh b/recipes/gettext/recipe.sh index 2e31ff247..056f0959c 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -39,13 +39,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 2a3d295bc..9b29ce3b7 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" - $REDOX_MAKE all -j"$($NPROC)" + "$REDOX_MAKE" all -j"$($NPROC)" skip=1 } @@ -28,7 +28,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } @@ -36,7 +36,7 @@ function recipe_stage { dest="$(realpath $1)" bundledir="$dest/bundle" - $REDOX_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 b985b7e6d..ab8edf0cb 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 - $REDOX_MAKE "${MAKEFLAGS[@]}" -j"$($NPROC)" + "$REDOX_MAKE" "${MAKEFLAGS[@]}" -j"$($NPROC)" skip=1 } @@ -49,13 +49,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 8522bdc0d..a04a50b67 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,13 +33,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 f16f944b9..bca6e157e 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -39,13 +39,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 5768da28b..f68e9cd21 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=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,13 +24,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 085f82aca..38ee7c58e 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,12 +29,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/gstreamer/recipe.sh b/recipes/gstreamer/recipe.sh index 0d30ad140..b31edf680 100644 --- a/recipes/gstreamer/recipe.sh +++ b/recipes/gstreamer/recipe.sh @@ -27,7 +27,7 @@ function recipe_build { --disable-benchmarks \ --disable-examples \ --disable-tests - $REDOX_MAKE -j"$($NPROC)" V=1 + "$REDOX_MAKE" -j"$($NPROC)" V=1 skip=1 } @@ -37,13 +37,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 5fdada614..f7cce8908 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -38,13 +38,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 d0dd49cbc..0d73e8161 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=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -26,12 +26,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/kernel/recipe.sh b/recipes/kernel/recipe.sh index 162703cbb..b30cc51c6 100644 --- a/recipes/kernel/recipe.sh +++ b/recipes/kernel/recipe.sh @@ -35,7 +35,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/libc-bench/recipe.sh b/recipes/libc-bench/recipe.sh index 441a3cdc3..23e63009e 100644 --- a/recipes/libc-bench/recipe.sh +++ b/recipes/libc-bench/recipe.sh @@ -12,7 +12,7 @@ function recipe_update { } function recipe_build { - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -22,7 +22,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/libffi/recipe.sh b/recipes/libffi/recipe.sh index 8fcfdb8a0..a78c84f6f 100644 --- a/recipes/libffi/recipe.sh +++ b/recipes/libffi/recipe.sh @@ -23,7 +23,7 @@ function recipe_build { --prefix=/ \ --disable-shared \ --enable-static - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,13 +33,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 c171111c6..5879cc93a 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -30,13 +30,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 fe92adf20..fa6d48ae8 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='/' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,13 +24,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 6c2ecfb52..577e7b1a8 100644 --- a/recipes/libogg/recipe.sh +++ b/recipes/libogg/recipe.sh @@ -19,7 +19,7 @@ function recipe_build { --build=${BUILD} \ --host=${HOST} \ --prefix='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 de9d0ec12..8e08a8fec 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)" - $REDOX_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 0cd5d4b96..ab3e9743b 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='/' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 7884d783d..fa86e9a16 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='/' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,12 +24,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/libvorbis/recipe.sh b/recipes/libvorbis/recipe.sh index 540d7ab5c..fd98adbc7 100644 --- a/recipes/libvorbis/recipe.sh +++ b/recipes/libvorbis/recipe.sh @@ -18,7 +18,7 @@ function recipe_build { --build=${BUILD} \ --host=${HOST} \ --prefix='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,13 +28,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 cba66e014..da0b938f3 100755 --- a/recipes/libxml2/recipe.sh +++ b/recipes/libxml2/recipe.sh @@ -23,7 +23,7 @@ function recipe_build { --disable-shared \ --enable-static \ --without-python - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,13 +33,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 2ea030baa..5f70e1f8d 100644 --- a/recipes/llvm/recipe.sh +++ b/recipes/llvm/recipe.sh @@ -63,7 +63,7 @@ function recipe_build { ) set -x cmake "${CMAKE_ARGS[@]}" "$source" - $REDOX_MAKE -j$(nproc) + "$REDOX_MAKE" -j$(nproc) set +x skip=1 } @@ -74,13 +74,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 4501a4bca..8bc39897b 100644 --- a/recipes/lua/recipe.sh +++ b/recipes/lua/recipe.sh @@ -12,7 +12,7 @@ function recipe_update { } function recipe_build { - $REDOX_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 { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/mdp/recipe.sh b/recipes/mdp/recipe.sh index 9a84cf065..20f24382d 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -26,12 +26,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 031dd8819..e62c40406 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 - $REDOX_MAKE V=1 -j"$($NPROC)" + "$REDOX_MAKE" V=1 -j"$($NPROC)" skip=1 } @@ -47,14 +47,14 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { #export LLVM_CONFIG="x86_64-unknown-redox-llvm-config" dest="$(realpath $1)" - $REDOX_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 183d4772d..8869ca798 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 ae0e0eb17..e37552e67 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 $REDOX_MAKE all -j"$($NPROC)" + VERBOSE=1 "$REDOX_MAKE" all -j"$($NPROC)" skip=1 } @@ -41,7 +41,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/nasm/recipe.sh b/recipes/nasm/recipe.sh index 0707da013..c419a2712 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="" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,13 +24,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 d4dbbb442..ca3f75b6e 100644 --- a/recipes/ncdu/recipe.sh +++ b/recipes/ncdu/recipe.sh @@ -19,7 +19,7 @@ function recipe_build { --build=${BUILD} \ --host="$HOST" \ --prefix=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } function recipe_test { @@ -27,11 +27,11 @@ function recipe_test { skip=1 } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath "$1")" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh index 99d1849b3..0de25cd90 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -31,13 +31,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 866d85ed3..407eb073a 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -25,13 +25,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 07cd91eca..82c7ea748 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" - $REDOX_MAKE V=1 -j"$($NPROC)" + "$REDOX_MAKE" V=1 -j"$($NPROC)" skip=1 } @@ -30,13 +30,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 0b60264bd..12cf43ce8 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 \ - $REDOX_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" - $REDOX_MAKE -j"$($NPROC)" ENABLE_FS=stdio ENABLE_NLS=0 clean-src - $REDOX_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 { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/newlib/recipe.sh b/recipes/newlib/recipe.sh index 5270cc06a..8b74cab1e 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=/ - $REDOX_MAKE all -j"$($NPROC)" + "$REDOX_MAKE" all -j"$($NPROC)" skip=1 } @@ -36,13 +36,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 23cc6a2b0..fde9fd630 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" - $REDOX_MAKE all -j"$($NPROC)" + "$REDOX_MAKE" all -j"$($NPROC)" skip=1 } @@ -26,12 +26,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 95e921d16..ee980382d 100644 --- a/recipes/nghttp2/recipe.sh +++ b/recipes/nghttp2/recipe.sh @@ -19,7 +19,7 @@ function recipe_build { --host="${HOST}" \ --prefix=/ \ --enable-lib-only - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 cc201d0c8..847b5d1d2 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='' - $REDOX_MAKE -j"$($NPROC)" V=1 + "$REDOX_MAKE" -j"$($NPROC)" V=1 skip=1 } @@ -32,12 +32,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh index 58291a37e..48b929ce3 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="/" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,13 +24,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 f5a48fa29..7dbedc016 100644 --- a/recipes/openttd/recipe.sh +++ b/recipes/openttd/recipe.sh @@ -22,7 +22,7 @@ function recipe_build { --without-liblzo2 \ --disable-network \ --without-threads - $REDOX_MAKE VERBOSE=1 -j"$($NPROC)" + "$REDOX_MAKE" VERBOSE=1 -j"$($NPROC)" skip=1 } @@ -32,7 +32,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } @@ -40,7 +40,7 @@ function recipe_stage { dest="$(realpath $1)" bundledir="$dest/bundle" - $REDOX_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 ef49d8773..9737c853c 100644 --- a/recipes/osdemo/recipe.sh +++ b/recipes/osdemo/recipe.sh @@ -30,7 +30,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/pango/recipe.sh b/recipes/pango/recipe.sh index bd2997a7e..24f77bb2d 100755 --- a/recipes/pango/recipe.sh +++ b/recipes/pango/recipe.sh @@ -24,7 +24,7 @@ function recipe_build { --prefix=/ \ --disable-shared \ --enable-static - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -34,13 +34,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 8e5a2f9e8..3c65091a7 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=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -26,13 +26,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 e39f4f22d..4e51f3b57 100644 --- a/recipes/pcre/recipe.sh +++ b/recipes/pcre/recipe.sh @@ -22,7 +22,7 @@ function recipe_build { --prefix=/ \ --disable-shared \ --enable-static - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -32,13 +32,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 c780b5f9f..8e03557ce 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -32,13 +32,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 64d87a417..70a762e11 100755 --- a/recipes/pixman/recipe.sh +++ b/recipes/pixman/recipe.sh @@ -19,7 +19,7 @@ function recipe_build { --prefix=/ \ --disable-shared \ --enable-static - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 0a5a208b7..4e1accb2f 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -31,13 +31,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { export DESTDIR="$(realpath $1)" - $REDOX_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 8827ec2f3..4569fc606 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -36,12 +36,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh index f0a87ab75..6ec06c195 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -36,13 +36,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 d5666cb1e..a62e7d9ff 100644 --- a/recipes/qemu/recipe.sh +++ b/recipes/qemu/recipe.sh @@ -21,7 +21,7 @@ function recipe_build { --build=${BUILD} \ --host="${HOST}" \ --prefix=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -31,14 +31,14 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { #export LLVM_CONFIG="x86_64-unknown-redox-llvm-config" dest="$(realpath $1)" - $REDOX_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 e3f2b821b..72dd391fb 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="" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -27,13 +27,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 bc89e71f8..4ec0a3d9c 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 { - $REDOX_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 4c561da6a..88f3acba6 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 { - $REDOX_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)" - $REDOX_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 02a3fd4e8..7a3a5fc3c 100644 --- a/recipes/rust/recipe.sh +++ b/recipes/rust/recipe.sh @@ -28,7 +28,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/schismtracker/recipe.sh b/recipes/schismtracker/recipe.sh index 3d3813002..5e3d9d6fe 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='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -30,12 +30,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/scummvm/recipe.sh b/recipes/scummvm/recipe.sh index df3b23278..44d5dc9f6 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -36,12 +36,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 4af3a0a11..8953164de 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -25,7 +25,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/sdl/recipe.sh b/recipes/sdl/recipe.sh index 250a4055e..be9cbd8dd 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -38,13 +38,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 8b68fe7f4..0bd502385 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -42,13 +42,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 1b8ecc888..7fe853e15 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,13 +28,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 1f52295c5..fe87ade35 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -40,13 +40,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 203b66acc..b4467c54a 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -29,13 +29,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 4915fbcff..089890fce 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,13 +28,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 2a199e888..7bbf8735b 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,13 +28,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 4dddfc6c5..9ed93a827 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -40,13 +40,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 dc4f19d6a..ce591b550 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,13 +28,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 840a0bc94..210a0d392 100644 --- a/recipes/sed/recipe.sh +++ b/recipes/sed/recipe.sh @@ -17,7 +17,7 @@ function recipe_build { --build=${BUILD} \ --host=${HOST} \ --prefix=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -27,12 +27,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 e2f764028..90779ca42 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 { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 7cc18a06b..5614139e6 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -33,12 +33,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/ssh/recipe.sh b/recipes/ssh/recipe.sh index 54a1917cb..1f9ba2bd3 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=/ - $REDOX_MAKE -j$(nproc) + "$REDOX_MAKE" -j$(nproc) skip=1 } @@ -27,12 +27,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/syobonaction/recipe.sh b/recipes/syobonaction/recipe.sh index d50ce4973..dd4f5246b 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" - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -27,7 +27,7 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } diff --git a/recipes/timidity/recipe.sh b/recipes/timidity/recipe.sh index b2f2f5cf8..d9c589905 100644 --- a/recipes/timidity/recipe.sh +++ b/recipes/timidity/recipe.sh @@ -22,7 +22,7 @@ function recipe_build { --host=${HOST} \ --prefix='' \ --enable-vt100 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -32,13 +32,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 f2b822e55..e024210d6 100644 --- a/recipes/vice/recipe.sh +++ b/recipes/vice/recipe.sh @@ -31,7 +31,7 @@ function recipe_build { --disable-rs232 \ --disable-realdevice \ --disable-midi - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -41,12 +41,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/vim/recipe.sh b/recipes/vim/recipe.sh index f0947359e..cc325653b 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -35,12 +35,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 1898c5ebe..a5c17fc1b 100644 --- a/recipes/vttest/recipe.sh +++ b/recipes/vttest/recipe.sh @@ -18,7 +18,7 @@ function recipe_build { --build=${BUILD} \ --host=${HOST} \ --prefix='' - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -28,12 +28,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } diff --git a/recipes/vvvvvv/recipe.sh b/recipes/vvvvvv/recipe.sh index 05debb531..110809b68 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" \ . - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } diff --git a/recipes/wesnoth/recipe.sh b/recipes/wesnoth/recipe.sh index 407ba87bd..a9dbef18e 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 $REDOX_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 c136f7f43..239add356 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 - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -48,13 +48,13 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_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 7bc4c5f03..7ad2070bc 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=/ - $REDOX_MAKE -j"$($NPROC)" + "$REDOX_MAKE" -j"$($NPROC)" skip=1 } @@ -24,12 +24,12 @@ function recipe_test { } function recipe_clean { - $REDOX_MAKE clean + "$REDOX_MAKE" clean skip=1 } function recipe_stage { dest="$(realpath $1)" - $REDOX_MAKE DESTDIR="$dest" install + "$REDOX_MAKE" DESTDIR="$dest" install skip=1 } -- GitLab