MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-nproc' into 'master'

Browse Source 
Limit netsurf build jobs

See merge request redox-os/redox!1813
This commit is contained in:
Jeremy Soller 2026-01-06 17:56:15 -07:00
commit b7d781579a
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/games/eduke32/recipe.toml
View File

@ -22,7 +22,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include/SDL"
export SDLCONFIG="${COOKBOOK_SYSROOT}/bin/sdl-config --prefix=${COOKBOOK_SYSROOT}"
PLATFORM=REDOX "${COOKBOOK_MAKE}" -j"$($NPROC)"
PLATFORM=REDOX "${COOKBOOK_MAKE}" -j"$COOKBOOK_MAKE_JOBS"
mkdir -pv "${COOKBOOK_STAGE}/usr/games"
cp -v ./eduke32 "${COOKBOOK_STAGE}/usr/games/eduke32"

2
recipes/libs/duktape/recipe.toml
View File

@ -9,7 +9,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
sed -i "s/= gcc/= ${TARGET}-gcc/g" Makefile.cmdline
"${COOKBOOK_MAKE}" -f Makefile.cmdline -j"$($NPROC)"
"${COOKBOOK_MAKE}" -f Makefile.cmdline -j"$COOKBOOK_MAKE_JOBS"
mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
cp ./duk "${COOKBOOK_STAGE}/usr/bin/duk"

7
recipes/web/netsurf/recipe.toml
View File

@ -26,14 +26,17 @@ DYNAMIC_INIT
# Netsurf does not currently support out-of-tree builds :(
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
# obscure crash from sccache if jobs number is too much
COOKBOOK_MAKE_JOBS="$(( ${COOKBOOK_MAKE_JOBS} > 8 ? 8 : ${COOKBOOK_MAKE_JOBS} ))"
export TARGET="framebuffer"
export CFLAGS="${CFLAGS} -I${PWD}/inst-${TARGET}/include"
export LDFLAGS="${LDFLAGS} -L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"
# nghttp2 is not linked for some reason
export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
"$COOKBOOK_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
"$COOKBOOK_MAKE" DESTDIR="$COOKBOOK_STAGE" PREFIX=/usr install -j"$($NPROC)"
"$COOKBOOK_MAKE" PREFIX=/usr V=1 -j"$COOKBOOK_MAKE_JOBS"
"$COOKBOOK_MAKE" DESTDIR="$COOKBOOK_STAGE" PREFIX=/usr install -j"$COOKBOOK_MAKE_JOBS"
mkdir -pv "$COOKBOOK_STAGE/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "$COOKBOOK_STAGE/ui/apps/00_netsurf"
"""

2
recipes/wip/vice/recipe.sh
View File

@ -26,7 +26,7 @@ function recipe_build {
--disable-rs232 \
--disable-realdevice \
--disable-midi
"$REDOX_MAKE" -j"$($NPROC)"
"$REDOX_MAKE" -j"$COOKBOOK_MAKE_JOBS"
skip=1
}