From 62c96897c037f7903f5df7b27319f6ed1c7ee93b Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:03:48 +0200 Subject: [PATCH 1/2] Remove newlib recipes We use relibc as libc rather than newlib. The redox newlib fork is also archived. --- recipes/other/newlib/recipe.sh | 40 ------------------------------ recipes/other/newlibtest/recipe.sh | 27 -------------------- 2 files changed, 67 deletions(-) delete mode 100644 recipes/other/newlib/recipe.sh delete mode 100644 recipes/other/newlibtest/recipe.sh diff --git a/recipes/other/newlib/recipe.sh b/recipes/other/newlib/recipe.sh deleted file mode 100644 index acb5d422..00000000 --- a/recipes/other/newlib/recipe.sh +++ /dev/null @@ -1,40 +0,0 @@ -GIT=https://gitlab.redox-os.org/redox-os/newlib.git -BRANCH=redox - -function recipe_version { - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - skip=1 -} - -function recipe_build { - pushd newlib/libc/sys - aclocal-1.11 -I ../.. - autoconf - automake-1.11 --cygnus Makefile - popd - - pushd newlib/libc/sys/redox - aclocal-1.11 -I ../../.. - autoconf - automake-1.11 --cygnus Makefile - popd - - CC= ./configure --build=${BUILD} --target="${HOST}" --prefix=/ - "$REDOX_MAKE" all -j"$($NPROC)" - - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - "$REDOX_MAKE" DESTDIR="$dest" install - cd "$dest" - mv $HOST/* ./ - rmdir $HOST - skip=1 -} diff --git a/recipes/other/newlibtest/recipe.sh b/recipes/other/newlibtest/recipe.sh deleted file mode 100644 index 33827109..00000000 --- a/recipes/other/newlibtest/recipe.sh +++ /dev/null @@ -1,27 +0,0 @@ -GIT=https://gitlab.redox-os.org/redox-os/newlibtest.git -BUILD_DEPENDS=(newlib) - -function recipe_version { - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - skip=1 -} - -function recipe_build { - sysroot="$(realpath ../sysroot)" - 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)" - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - "$REDOX_MAKE" DESTDIR="$dest" prefix=/ install - skip=1 -} From c5c0d78533c2d4f7eb100f40589b28caf27029e3 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:04:54 +0200 Subject: [PATCH 2/2] Remove webrender recipe While it has some demo executables, it is meant to be used as rust dependency rather than a standalone library. And in fact can't be installed as standalone library. --- recipes/libs/webrender/recipe.sh | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 recipes/libs/webrender/recipe.sh diff --git a/recipes/libs/webrender/recipe.sh b/recipes/libs/webrender/recipe.sh deleted file mode 100644 index a275c3fb..00000000 --- a/recipes/libs/webrender/recipe.sh +++ /dev/null @@ -1,32 +0,0 @@ -GIT=https://gitlab.redox-os.org/redox-os/webrender.git -GIT_UPSTREAM=https://github.com/servo/webrender.git -BRANCH=redox -BUILD_DEPENDS=(freetype2 libpng llvm18 mesa zlib) - -function recipe_build { - sysroot="$(realpath ../sysroot)" - for rs in $(find examples/ -maxdepth 1 -type f -name '*.rs') - do - bin="$(basename "$rs" .rs)" - set -x - cargo rustc --target "$TARGET" --release --manifest-path examples/Cargo.toml --bin "$bin" \ - -- \ - -L "${sysroot}/lib" \ - -l static=freetype \ - -l static=png \ - -C link-args="-Wl,-Bstatic $("${PKG_CONFIG}" --libs osmesa) -lz -lstdc++ -lc -lgcc" - set +x - done - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - mkdir -pv "$dest/bin" - for rs in $(find examples/ -maxdepth 1 -type f -name '*.rs') - do - bin="$(basename "$rs" .rs)" - "${STRIP}" -v "target/$TARGET/release/$bin" -o "$dest/bin/webrender_$bin" - done - skip=1 -}