16 files changed, 30 insertions, 40 deletions
diff --git a/repo/devel/gdb/gdb.xibuild b/repo/devel/gdb/gdb.xibuild
index 31d9b7c..5b3b3a8 100644
--- a/repo/devel/gdb/gdb.xibuild
+++ b/repo/devel/gdb/gdb.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make expat guile ncurses python xz texinfo"
-DEPS="python-six doxygen gcc guile rustc python valgrind systemtap"
+DEPS="python-six doxygen gcc guile rust python valgrind systemtap"
 
 PKG_VER=11.2
 SOURCE=https://ftp.gnu.org/gnu/gdb/gdb-$PKG_VER.tar.xz
diff --git a/repo/devel/llvm/clang.xibuild b/repo/devel/llvm/clang.xibuild
index f00b98c..4a3f4f4 100644
--- a/repo/devel/llvm/clang.xibuild
+++ b/repo/devel/llvm/clang.xibuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 DESC="$DESC - C language frontend"
+DEPS="libclang"
 
 package () {
     add_from_main usr/include/clang
diff --git a/repo/devel/rustc/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
index 30cb66f..30cb66f 100644
--- a/repo/devel/rustc/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ b/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff --git a/repo/devel/rustc/patches/0007-do-not-install-libunwind-source.patch b/repo/devel/rust/0007-do-not-install-libunwind-source.patch
index e8ff8b7..e8ff8b7 100644
--- a/repo/devel/rustc/patches/0007-do-not-install-libunwind-source.patch
+++ b/repo/devel/rust/0007-do-not-install-libunwind-source.patch
diff --git a/repo/devel/rustc/patches/alpine-move-py-scripts-to-share.patch b/repo/devel/rust/alpine-move-py-scripts-to-share.patch
index 21be36f..21be36f 100644
--- a/repo/devel/rustc/patches/alpine-move-py-scripts-to-share.patch
+++ b/repo/devel/rust/alpine-move-py-scripts-to-share.patch
diff --git a/repo/devel/rustc/patches/alpine-target.patch b/repo/devel/rust/alpine-target.patch
index 2392cdd..2392cdd 100644
--- a/repo/devel/rustc/patches/alpine-target.patch
+++ b/repo/devel/rust/alpine-target.patch
diff --git a/repo/devel/rust/cargo.xibuild b/repo/devel/rust/cargo.xibuild
new file mode 100644
index 0000000..8a9f47e
--- /dev/null
+++ b/repo/devel/rust/cargo.xibuild
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+DEPS="rust"
+DESC="Rust package manager"
+
+package () {
+    add_from_main "usr/bin/cargo"
+}
diff --git a/repo/devel/rustc/files/check-rustc b/repo/devel/rust/check-rustc
index d4b85be..d4b85be 100644
--- a/repo/devel/rustc/files/check-rustc
+++ b/repo/devel/rust/check-rustc
diff --git a/repo/devel/rustc/patches/install-template-shebang.patch b/repo/devel/rust/install-template-shebang.patch
index e81b579..e81b579 100644
--- a/repo/devel/rustc/patches/install-template-shebang.patch
+++ b/repo/devel/rust/install-template-shebang.patch
diff --git a/repo/devel/rustc/patches/link-musl-dynamically.patch b/repo/devel/rust/link-musl-dynamically.patch
index 55d02a3..55d02a3 100644
--- a/repo/devel/rustc/patches/link-musl-dynamically.patch
+++ b/repo/devel/rust/link-musl-dynamically.patch
diff --git a/repo/devel/rustc/patches/musl-fix-linux_musl_base.patch b/repo/devel/rust/musl-fix-linux_musl_base.patch
index 1771ffe..1771ffe 100644
--- a/repo/devel/rustc/patches/musl-fix-linux_musl_base.patch
+++ b/repo/devel/rust/musl-fix-linux_musl_base.patch
diff --git a/repo/devel/rustc/patches/need-rpath.patch b/repo/devel/rust/need-rpath.patch
index 5ab8377..5ab8377 100644
--- a/repo/devel/rustc/patches/need-rpath.patch
+++ b/repo/devel/rust/need-rpath.patch
diff --git a/repo/devel/rustc/patches/need-ssp_nonshared.patch b/repo/devel/rust/need-ssp_nonshared.patch
index f1adf20..f1adf20 100644
--- a/repo/devel/rustc/patches/need-ssp_nonshared.patch
+++ b/repo/devel/rust/need-ssp_nonshared.patch
diff --git a/repo/devel/rustc/rustc.xibuild b/repo/devel/rust/rust.xibuild
index 090aa01..a3075e3 100644
--- a/repo/devel/rustc/rustc.xibuild
+++ b/repo/devel/rust/rust.xibuild
@@ -1,27 +1,26 @@
 #!/bin/sh
 
-MAKEDEPS="cmake clang llvm-ar"
-DEPS="curl libssh2 openssl"
+MAKEDEPS="cmake libclang clang llvm curl"
+DEPS="libssh2 openssl"
 
-PKG_VER=1.58.1
+PKG_VER=1.59.0
 SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz
 DESC="Systems programming language focused on safety, speed and concurrency"
 
 ADDITIONAL="
-    patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-    patches/0007-do-not-install-libunwind-source.patch
-    patches/install-template-shebang.patch
-    patches/link-musl-dynamically.patch
-    patches/musl-fix-linux_musl_base.patch
-    patches/need-rpath.patch
-    patches/need-ssp_nonshared.patch
+    0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+    0007-do-not-install-libunwind-source.patch
+    install-template-shebang.patch
+    link-musl-dynamically.patch
+    musl-fix-linux_musl_base.patch
+    need-rpath.patch
+    need-ssp_nonshared.patch
 "
 
 prepare () {
     apply_patches
     sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py
     sed -i 's/\("files":{\)[^}]*/\1/' vendor/libc/.cargo-checksum.json
-
 }
 
 build () {
@@ -48,16 +47,16 @@ build () {
 		--set="target.$target.llvm-config=/usr/bin/llvm-config" \
 		--set="target.$target.musl-root=/usr" \
 		--set="target.$target.crt-static=false" \
-		--set="target.$target.cc=clang" \
-		--set="target.$target.cxx=clang++" \
-		--set="target.$target.ar=llvm-ar" \
-		--set="target.$target.linker=clang" \
+		--set="target.$target.cc=gcc" \
+		--set="target.$target.cxx=g++" \
+		--set="target.$target.ar=ar" \
+		--set="target.$target.linker=gcc" \
 		--set="target.$build.musl-root=/usr" \
 		--set="target.$build.crt-static=false" \
-		--set="target.$build.cc=clang" \
-		--set="target.$build.cxx=clang++" \
-		--set="target.$build.ar=llvm-ar" \
-		--set="target.$build.linker=clang"
+		--set="target.$build.cc=gcc" \
+		--set="target.$build.cxx=g++" \
+		--set="target.$build.ar=ar" \
+		--set="target.$build.linker=gcc" \
 
     	sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
         sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
@@ -73,22 +72,4 @@ package () {
 
     chown -R root:root install &&
     cp -a install/* $PKG_DEST
-
-    mkdir -p $PKG_DEST/etc/profile.d/
-    cat > $PKG_DEST/etc/profile.d/rustc.sh << "EOF"
-# Begin /etc/profile.d/rustc.sh
-
-pathprepend /opt/rustc/bin           PATH
-
-# End /etc/profile.d/rustc.sh
-EOF
-    mkdir -p $PKG_DEST/etc/ld.so.conf.d
-cat >> $PKG_DEST/etc/ld.so.conf.d/rustc.conf << EOF
-# Begin rustc addition
-
-/opt/rustc/lib
-
-# End rustc addition
-EOF
-
 }
diff --git a/repo/devel/strace/strace.xibuild b/repo/devel/strace/strace.xibuild
index e523146..2c925ba 100644
--- a/repo/devel/strace/strace.xibuild
+++ b/repo/devel/strace/strace.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="autoconf automake binutils-dev elfutils-dev gawk linux-headers"
+MAKEDEPS="autoconf automake binutils elfutils gawk linux-headers"
 DEPS="libelf musl"
 
 PKG_VER=5.17
diff --git a/repo/devel/vala/vala.xibuild b/repo/devel/vala/vala.xibuild
index a457cca..c9736a3 100644
--- a/repo/devel/vala/vala.xibuild
+++ b/repo/devel/vala/vala.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="libxslt bash flex bison gobject-introspection graphviz"
-DEPS="glib graphviz musl pkgconf"
+DEPS="glib graphviz musl pkg-config"
 
 PKG_VER=0.54.7
 SOURCE=https://download.gnome.org/sources/vala/${PKG_VER%.*}/vala-$PKG_VER.tar.xz