added and patched broken packages

14 files changed, 281 insertions, 166 deletions

diff --git a/repo/devel/asciidoc.xibuild b/repo/devel/asciidoc.xibuild
index 5ffb83c..34202d0 100644
--- a/repo/devel/asciidoc.xibuild
+++ b/repo/devel/asciidoc.xibuild
@@ -10,6 +10,6 @@ DESC="Text document format for short documents, articles, books and UNIX man pag
 package () {
     pip install -t $PKG_DEST/usr/lib/python3.10/site-packages/ asciidoc
     mkdir -p $PKG_DEST/usr/bin
-    #ln -s /usr/lib/python3.10/site-packages/bin/asciidoc $PKG_DEST/usr/bin/asciidoc
-    #ln -s /usr/lib/python3.10/site-packages/bin/a2x $PKG_DEST/usr/bin/a2x
+    ln -s /usr/lib/python3.10/site-packages/bin/asciidoc $PKG_DEST/usr/bin/asciidoc
+    ln -s /usr/lib/python3.10/site-packages/bin/a2x $PKG_DEST/usr/bin/a2x
 }
diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild
index 8b9c9b0..f917868 100644
--- a/repo/devel/clang.xibuild
+++ b/repo/devel/clang.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe" 
+MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe python-pygments" 
 DEPS="curl gcc libssh2 openssl"
 
 PKG_VER=13.0.1
@@ -8,8 +8,8 @@ SOURCE=https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/c
 DESC="Systems programming language focused on safety, speed and concurrency"
 
 ADDITIONAL="
-    patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-    patches/clang/10-add-musl-triples.patch
+    patches/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+    patches/10-add-musl-triples.patch
     "
 
 prepare () {
diff --git a/repo/devel/cmake-extra.xibuild b/repo/devel/cmake-extra.xibuild
new file mode 100644
index 0000000..a81994f
--- /dev/null
+++ b/repo/devel/cmake-extra.xibuild
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MAKEDEPS="cmake"
+DEPS="cmake"
+
+PKG_VER=1.6
+SOURCE=https://gitlab.com/ubports/core/cmake-extras/-/archive/$PKG_VER/cmake-extras-$PKG_VER.tar.gz
+DESC="A collection of add-ons for the CMake build tool"
+
+build () {
+    cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
+
+}
+
+package () {
+    DESTDIR="$PKG_DEST" cmake --build build --target install
+}
diff --git a/repo/devel/cmake-modules.xibuild b/repo/devel/cmake-modules.xibuild
new file mode 100644
index 0000000..b23083d
--- /dev/null
+++ b/repo/devel/cmake-modules.xibuild
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+MAKEDEPS="cmake python-sphinx"
+DEPS="cmake"
+
+PKG_VER=5.91.0
+SOURCE=https://download.kde.org/stable/frameworks/${PKG_VER%.*}/extra-cmake-modules-$PKG_VER.tar.xz
+DESC="Extra CMake modules"
+
+build () {
+    cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSphinx_BUILD_EXECUTABLE=/usr/bin/sphinx-build
+	cmake --build build
+
+}
+
+package () {
+    DESTDIR="$PKG_DEST" cmake --build build --target install
+}
diff --git a/repo/devel/distcc.xibuild b/repo/devel/distcc.xibuild
index a5c390f..d7ceaf2 100644
--- a/repo/devel/distcc.xibuild
+++ b/repo/devel/distcc.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="python make "
-DEPS="gcc python popt"
+DEPS="gcc python popt musl-obstack"
 
 PKG_VER=3.4
 SOURCE=https://github.com/distcc/distcc/releases/download/v$PKG_VER/distcc-$PKG_VER.tar.gz
diff --git a/repo/devel/docbook4-xml.xibuild b/repo/devel/docbook4-xml.xibuild
index b29b7ef..ba31b18 100644
--- a/repo/devel/docbook4-xml.xibuild
+++ b/repo/devel/docbook4-xml.xibuild
@@ -7,81 +7,97 @@ PKG_VER=4.5
 SOURCE=https://www.docbook.org/xml/$PKG_VER/docbook-xml-$PKG_VER.zip
 DESC="A widely used XML scheme for writing documentation and help"
 
+VERSIONS="4.5 4.4 4.3 4.2"
+
+ADDITIONAL="
+    https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
+    https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
+    https://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
+"
+
 package () {
-    install -m755 -d $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5 &&
-    install -m755 -d $PKG_DEST/etc/xml &&
-    chown -R root:root . &&
-    cp -af docbook.cat *.dtd ent/ *.mod \
-        $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
+    for v in $VERSIONS; do 
+        mkdir docbook-xml-$v
+        cd docbook-xml-$v
+        unzip -o ../docbook-xml-$v.zip
+        install -m755 -d $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v &&
+        install -m755 -d $PKG_DEST/etc/xml &&
+        chown -R root:root . &&
+        cp -af docbook.cat *.dtd ent/ *.mod \
+            $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v
 
+        cd ..
+    done
     }
 
 postinstall () {
-    if [ ! -e /etc/xml/docbook ]; then
-        xmlcatalog --noout --create /etc/xml/docbook
-    fi &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD DocBook XML V4.5//EN" \
-        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "rewriteSystem" \
-        "http://www.oasis-open.org/docbook/xml/4.5" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-        /etc/xml/docbook &&
-    xmlcatalog --noout --add "rewriteURI" \
-        "http://www.oasis-open.org/docbook/xml/4.5" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-        /etc/xml/docbook
-    if [ ! -e /etc/xml/catalog ]; then
-        xmlcatalog --noout --create /etc/xml/catalog
-    fi &&
-    xmlcatalog --noout --add "delegatePublic" \
-        "-//OASIS//ENTITIES DocBook XML" \
-        "file:///etc/xml/docbook" \
-        /etc/xml/catalog &&
-    xmlcatalog --noout --add "delegatePublic" \
-        "-//OASIS//DTD DocBook XML" \
-        "file:///etc/xml/docbook" \
-        /etc/xml/catalog &&
-    xmlcatalog --noout --add "delegateSystem" \
-        "http://www.oasis-open.org/docbook/" \
-        "file:///etc/xml/docbook" \
-        /etc/xml/catalog &&
-    xmlcatalog --noout --add "delegateURI" \
-        "http://www.oasis-open.org/docbook/" \
-        "file:///etc/xml/docbook" \
-        /etc/xml/catalog
+    for v in $VERSIONS; do 
+        if [ ! -e /etc/xml/docbook ]; then
+            xmlcatalog --noout --create /etc/xml/docbook
+        fi &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//DTD DocBook XML V$v//EN" \
+            "http://www.oasis-open.org/docbook/xml/$v/docbookx.dtd" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//DTD DocBook XML CALS Table Model V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/calstblx.dtd" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/soextblx.dtd" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ELEMENTS DocBook XML Information Pool V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/dbpoolx.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/dbhierx.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ELEMENTS DocBook XML HTML Tables V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/htmltblx.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ENTITIES DocBook XML Notations V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/dbnotnx.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ENTITIES DocBook XML Character Entities V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/dbcentx.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "public" \
+            "-//OASIS//ENTITIES DocBook XML Additional General Entities V$v//EN" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v/dbgenent.mod" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "rewriteSystem" \
+            "http://www.oasis-open.org/docbook/xml/$v" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v" \
+            /etc/xml/docbook &&
+        xmlcatalog --noout --add "rewriteURI" \
+            "http://www.oasis-open.org/docbook/xml/$v" \
+            "file:///usr/share/xml/docbook/xml-dtd-$v" \
+            /etc/xml/docbook
+        if [ ! -e /etc/xml/catalog ]; then
+            xmlcatalog --noout --create /etc/xml/catalog
+        fi &&
+        xmlcatalog --noout --add "delegatePublic" \
+            "-//OASIS//ENTITIES DocBook XML" \
+            "file:///etc/xml/docbook" \
+            /etc/xml/catalog &&
+        xmlcatalog --noout --add "delegatePublic" \
+            "-//OASIS//DTD DocBook XML" \
+            "file:///etc/xml/docbook" \
+            /etc/xml/catalog &&
+        xmlcatalog --noout --add "delegateSystem" \
+            "http://www.oasis-open.org/docbook/" \
+            "file:///etc/xml/docbook" \
+            /etc/xml/catalog &&
+        xmlcatalog --noout --add "delegateURI" \
+            "http://www.oasis-open.org/docbook/" \
+            "file:///etc/xml/docbook" \
+            /etc/xml/catalog
+    done
 }
 
diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild
index 18b6e2e..25e2ad5 100644
--- a/repo/devel/gcc.xibuild
+++ b/repo/devel/gcc.xibuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 MAKEDEPS="grep make dejagnu inetutils flex"
-DEPS="musl binutils mpc mpfr gmp"
+DEPS="zstd musl binutils mpc mpfr gmp"
+
 
 PKG_VER=11.2.0
 SOURCE=https://ftp.gnu.org/gnu/gcc/gcc-$PKG_VER/gcc-$PKG_VER.tar.xz
@@ -56,6 +57,8 @@ ADDITIONAL="
 DESC="The GNU Compiler Collection - C and C++ frontends"
 
 prepare () {
+    export languages="c,c++,lto"
+
     case $(uname -m) in
       x86_64) export TRUPLE="x86_64-linux-musl"
               export EXTRA_CONFIG=" --with-arch=x86-64"
@@ -85,18 +88,17 @@ build () {
     mkdir build
     cd build
 
-    export  NOFF="--disable-libstdcxx-pch "
-    export NOFF+="--disable-nls "
-    export NOFF+="--disable-multilib "
-    export NOFF+="--disable-bootstrap "
-    export NOFF+="--disable-symvers "
-    export NOFF+="--disable-libsanitizer "
-    export NOFF+="--disable-libssp "
-    export NOFF+="--disable-libmpx "
-    export NOFF+="--disable-libmudflap "
-    export NOFF+="--disable-fixed-point "
-    export NOFF+="--disable-sjlj-exceptions "
-    export NOFF+="--disable-werror "
+    export  NOFF="--disable-libstdcxx-pch 
+                  --disable-nls 
+                  --disable-multilib 
+                  --disable-bootstrap 
+                  --disable-symvers 
+                  --disable-libsanitizer 
+                  --disable-libmpx 
+                  --disable-libmudflap 
+                  --disable-fixed-point 
+                  --disable-sjlj-exceptions 
+                  --disable-werror "
 
     # Enable graphite
     export XCONFIG="--with-ppl=yes --with-cloog=yes "
@@ -105,28 +107,40 @@ build () {
     export XTRA86="--with-arch=x86-64 "
 
     # Enable features
-    export  FON="--enable-threads=posix "
-    export FON+="--enable-clocale=generic "
-    export FON+="--enable-tls "
-    export FON+="--enable-libstdcxx-time "
-    export FON+="--enable-fully-dynamic-string "
-    export FON+="--enable-default-ssp "
-    export FON+="--enable-linker-build-id "
-    export FON+="--enable-checking=release "
-    export FON+="--enable-cloog-backend "
-    export FON+="--enable-__cxa_atexit "
-    export FON+="--enable-lto "
-    export FON+="--enable-plugins "
-    export FON+="--with-system-zlib "
-    export FON+="--with-linker-hash-style=gnu "
+    export  FON="--enable-threads=posix 
+                 --enable-clocale=generic 
+                 --enable-tls 
+                 --enable-libstdcxx-time 
+                 --enable-fully-dynamic-string 
+                 --enable-linker-build-id 
+                 --enable-checking=release 
+                 --enable-cloog-backend 
+                 --enable-__cxa_atexit 
+                 --enable-lto 
+                 --enable-plugins 
+                 --with-system-zlib 
+                 --with-linker-hash-style=gnu "
     #export FON+="--with-isl "
 
     # Configure source
     SED=sed  libat_cv_have_ifunc=no  \
-    ../configure --prefix=/usr            \
-                 --target=${TRUPLE}          \
-                 --enable-languages=c,c++,lto \
-                 $NOFF $XTRA86 $XCONFIG $FON &&
+    ../configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-pkgversion="XiLinux $PKG_VER" \
+		--enable-checking=release \
+		--disable-fixed-point \
+		--disable-libstdcxx-pch \
+		--disable-multilib \
+		--disable-nls \
+		--disable-werror \
+		--enable-__cxa_atexit \
+		--enable-default-pie \
+		--enable-cloog-backend \
+		--enable-languages=$languages \
+		--with-system-zlib \
+        --target=${TRUPLE}          \
+        $NOFF $XTRA86 $XCONFIG $FON &&
 
     make &&
 
diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild
index f7bcd27..ab8e273 100644
--- a/repo/devel/git.xibuild
+++ b/repo/devel/git.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="grep python make xmlto"
+MAKEDEPS="grep python make xmlto cmake"
 DEPS="curl perl openssl pcre2 grep shadow zlib openssh"
 
 PKG_VER=2.34.1
diff --git a/repo/devel/go.xibuild b/repo/devel/go.xibuild
index 9673f12..9a5f1b7 100644
--- a/repo/devel/go.xibuild
+++ b/repo/devel/go.xibuild
@@ -1,26 +1,53 @@
 #!/bin/sh
 
-MAKEDEPS="make"
+# Ensure we have gcc-go
+MAKEDEPS="make gcc"
 DEPS=""
 
 PKG_VER=1.17.7
 SOURCE=https://go.dev/dl/go$PKG_VER.src.tar.gz
+
+BOOTSTRAP="go1.4-bootstrap-20171003"
+ADDITIONAL="
+    https://dl.google.com/go/$BOOTSTRAP.tar.gz
+"
+
 DESC="Core compiler tools for the Go programming language"
 
+prepare () {
+    export TMPDIR=/tmp
+    tar -xvf $BOOTSTRAP.tar.gz
+    mv go $BOOTSTRAP
+}
+
 build () {
-  export GOARCH=amd64
-  export GOAMD64=v1 # make sure we're building for the right x86-64 version
-  export GOROOT_FINAL=/usr/lib/go
-  export GOROOT_BOOTSTRAP=/usr/lib/go
-
-  cd src
-  ./make.bash -v
-  cd ..
+    export sourceroot=$(pwd)
+    export GOARCH=amd64
+    export GOAMD64=v1 # make sure we're building for the right x86-64 version
+    export GOOS="linux"
+
+    cd $BOOTSTRAP
+    cd src
+    echo "~~~~BUILDING BOOTSTRAP"
+    CGO_ENABLED=0 ./make.bash -v
+    
+    cd $sourceroot
+    export GOROOT_FINAL=/usr/lib/go
+    export GOROOT_BOOTSTRAP="$(pwd)/$BOOTSTRAP"
+
+    echo "~~~~BUILDING GOLANG"
+    cd src
+    if [ ! -z "${GOROOT_BOOTSTRAP}" ]; then
+        ./bootstrap.bash -v
+    fi
+    ./make.bash -v
+    cd ..
 }
 
 package () {
   install -d "$PKG_DEST/usr/bin" "$PKG_DEST/usr/lib/go" "$PKG_DEST/usr/share/doc/go" \
-    "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"{dynlink,race}
+    "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"dynlink \
+    "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"race
 
   cp -a bin pkg src lib misc api test "$PKG_DEST/usr/lib/go"
   cp -r doc/* "$PKG_DEST/usr/share/doc/go"
diff --git a/repo/devel/gtk-doc.xibuild b/repo/devel/gtk-doc.xibuild
new file mode 100644
index 0000000..074eca0
--- /dev/null
+++ b/repo/devel/gtk-doc.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="docbook4-xml docbook-dtd docbook-xsl itstool libxslt"
+
+PKG_VER=1.33.2
+SOURCE=https://download.gnome.org/sources/gtk-doc/${PKG_VER%.*}/gtk-doc-$PKG_VER.tar.xz
+DESC="Documentation tool for public library API"
+
+prepare () {
+    autoreconf -fiv
+}
+build () {
+    ./configure --prefix=/usr &&
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/devel/icecream-sundae.xibuild b/repo/devel/icecream-sundae.xibuild
deleted file mode 100644
index 58f08aa..0000000
--- a/repo/devel/icecream-sundae.xibuild
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="meson ninja"
-DEPS="ncurses glib icecream"
-
-PKG_VER=1.0.0
-SOURCE=https://github.com/JPEWdev/icecream-sundae
-
-DESC="A build distribution service based on distcc"
-
-
-build () {
-    mkdir builddir
-    cd builddir
-
-    meson .. --buildtype release
-    ninja
-
-}
-
-
-package () {
-    DESTDIR=$PKG_DEST ninja install
-}
diff --git a/repo/devel/itstool.xibuild b/repo/devel/itstool.xibuild
new file mode 100644
index 0000000..721c5a7
--- /dev/null
+++ b/repo/devel/itstool.xibuild
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="docbook-xml"
+
+PKG_VER=2.0.7
+SOURCE=http://files.itstool.org/itstool/itstool-2.0.7.tar.bz2
+DESC="Extract messages from XML files and output PO template files"
+
+build () {
+    PYTHON=/usr/bin/python3 ./configure --prefix=/usr &&
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/devel/m4.xibuild b/repo/devel/m4.xibuild
index f459376..e6ccf14 100644
--- a/repo/devel/m4.xibuild
+++ b/repo/devel/m4.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make help2man"
-DEPS="musl bash"
+DEPS="musl sh"
 
 PKG_VER=1.4.19
 SOURCE=https://ftp.gnu.org/gnu/m4/m4-$PKG_VER.tar.xz
diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild
index bab5553..049ecae 100644
--- a/repo/devel/rustc.xibuild
+++ b/repo/devel/rustc.xibuild
@@ -8,29 +8,26 @@ 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/rustc/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-    patches/rustc/0007-do-not-install-libunwind-source.patch
-    patches/rustc/install-template-shebang.patch
-    patches/rustc/link-musl-dynamically.patch
-    patches/rustc/musl-fix-linux_musl_base.patch
-    patches/rustc/need-rpath.patch
-    patches/rustc/need-ssp_nonshared.patch
-    patches/rustc/need-ssp_nonshared.patch
+    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
 "
 
 prepare () {
-   
     apply_patches
+    sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py
+    sed -i 's/\("files":{\)[^}]*/\1/' vendor/libc/.cargo-checksum.json
 
-    mkdir -p $PKG_DEST/opt/rustc-$PKG_VER             &&
-    ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc
 }
 
 build () {
-    export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" &&
     target=x86_64-unknown-linux-musl
     build=x86_64-unknown-linux-musl
-    CFLAGS="-fPIE" CXXFLAGS="-fPIE" ./configure \
+    ./configure \
         --build="$build" \
         --host="$target" \
         --target="$target" \
@@ -51,18 +48,21 @@ 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=c++" \
+		--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=c++" \
+		--set="target.$build.ar=ar" \
+		--set="target.$build.linker=gcc"
 
-        python ./x.py dist --jobs $JOBS
+    	sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
+        sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
+
+        python ./x.py dist -v --jobs $JOBS
 
 }