From c619997825027d4b49902777acbf1b2b939b639e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 21 Feb 2023 11:52:50 -0700
Subject: [PATCH] Remove all references to xargo
---
Xargo.toml | 10 ----------
clean.sh | 2 --
config.sh | 1 -
cook.sh | 1 -
recipes/block_encrypt/recipe.sh | 3 ---
recipes/kernel/recipe.toml | 4 ++--
recipes/relibc-tests/recipe.sh | 2 +-
recipes/rust-cairo-demo/recipe.sh | 1 -
recipes/rust-cairo/recipe.sh | 1 -
setup.sh | 5 -----
10 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 Xargo.toml
delete mode 100644 recipes/block_encrypt/recipe.sh
diff --git a/Xargo.toml b/Xargo.toml
deleted file mode 100644
index 942fbc3ac..000000000
--- a/Xargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[target.aarch64-unknown-redox.dependencies.std]
-features = ["panic_unwind"]
-
-[target.x86_64-unknown-redox.dependencies.std]
-features = ["panic_unwind"]
-#features = ["panic_unwind", "backtrace"]
-
-#[dependencies.test]
-#stage = 1
-
diff --git a/clean.sh b/clean.sh
index 0bf362f81..f4c2eb619 100755
--- a/clean.sh
+++ b/clean.sh
@@ -14,5 +14,3 @@ for recipe in $recipes
do
./cook.sh "$recipe" distclean
done
-
-rm -rf xargo
diff --git a/config.sh b/config.sh
index 4dc41ba33..7b2d34aee 100755
--- a/config.sh
+++ b/config.sh
@@ -13,7 +13,6 @@ HOST="$TARGET"
ROOT="$(cd `dirname "$0"` && pwd)"
REPO="$ROOT/repo/$TARGET"
export PATH="${ROOT}/bin:$PATH"
-export XARGO_HOME="${ROOT}/xargo"
export AR="${HOST}-gcc-ar"
export AS="${HOST}-as"
diff --git a/cook.sh b/cook.sh
index aa1c03a0d..f66e4f93b 100755
--- a/cook.sh
+++ b/cook.sh
@@ -235,7 +235,6 @@ function op {
if [ "$skip" -eq "0" ]
then
- cp -p "$ROOT/Xargo.toml" "Xargo.toml"
"${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $package_flag $CARGOFLAGS
fi
popd > /dev/null
diff --git a/recipes/block_encrypt/recipe.sh b/recipes/block_encrypt/recipe.sh
deleted file mode 100644
index e698ea4ae..000000000
--- a/recipes/block_encrypt/recipe.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-GIT=https://github.com/tomasritter/block_encrypt.git
-CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS -C target-feature=+aes" xargo)
-
diff --git a/recipes/kernel/recipe.toml b/recipes/kernel/recipe.toml
index 03d037bd3..9ab96b280 100644
--- a/recipes/kernel/recipe.toml
+++ b/recipes/kernel/recipe.toml
@@ -1,5 +1,5 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/kernel.git"
+#[source]
+#git = "https://gitlab.redox-os.org/redox-os/kernel.git"
[build]
template = "custom"
diff --git a/recipes/relibc-tests/recipe.sh b/recipes/relibc-tests/recipe.sh
index 4ec0a3d9c..dc39853b3 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" NATIVE_RELIBC=1 -C tests -j"$($NPROC)"
skip=1
}
diff --git a/recipes/rust-cairo-demo/recipe.sh b/recipes/rust-cairo-demo/recipe.sh
index 13e373e65..2b493d1ff 100644
--- a/recipes/rust-cairo-demo/recipe.sh
+++ b/recipes/rust-cairo-demo/recipe.sh
@@ -3,7 +3,6 @@ BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
function recipe_build {
sysroot="$(realpath ../sysroot)"
- cp -p "$ROOT/Xargo.toml" "Xargo.toml"
cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-- \
-L "${sysroot}/lib" \
diff --git a/recipes/rust-cairo/recipe.sh b/recipes/rust-cairo/recipe.sh
index b44846398..a9a5725fa 100644
--- a/recipes/rust-cairo/recipe.sh
+++ b/recipes/rust-cairo/recipe.sh
@@ -4,7 +4,6 @@ CARGOFLAGS="--example gui"
function recipe_build {
sysroot="$(realpath ../sysroot)"
- cp -p "$ROOT/Xargo.toml" "Xargo.toml"
cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-- \
-L "${sysroot}/lib" \
diff --git a/setup.sh b/setup.sh
index bb8e5218e..25b6377a3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -16,10 +16,5 @@ then
echo "Installing cargo-config"
cargo install -f cargo-config
fi
-if [ -z "$(which xargo)" ]
-then
- echo "Installing xargo"
- cargo install -f xargo
-fi
echo "cook.sh is ready to use"
--
GitLab