[upd] r47→r48

7 files changed, 58 insertions, 270 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e47a0209a217..c0721361252b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,84 +1,37 @@
 pkgbase = devkitarm
 	pkgdesc = ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development
-	pkgver = r47
+	pkgver = r48
 	pkgrel = 1
 	url = http://devkitpro.org
 	install = devkitarm.install
-	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = freeimage
-	depends = python
 	depends = flex
 	depends = libmpc
-	depends = libusb
-	noextract = binutils-2.28.tar.bz2
-	noextract = gcc-7.1.0.tar.bz2
-	noextract = newlib-2.5.0.tar.gz
-	noextract = gdb-8.0.tar.bz2
-	noextract = general-tools-1.0.0.tar.bz2
-	noextract = gbatools-1.0.0.tar.bz2
-	noextract = gp32tools-1.0.3.tar.bz2
-	noextract = dstools-1.1.0.tar.bz2
-	noextract = grit-0.8.14.tar.bz2
-	noextract = ndstool-2.0.3.tar.bz2
-	noextract = dlditool-1.24.0.tar.bz2
-	noextract = mmutil-1.8.6.tar.bz2
-	noextract = dfu-util-0.9.1.tar.bz2
-	noextract = stlink-1.2.2.tar.bz2
-	noextract = 3dslink-0.5.2.tar.bz2
-	noextract = 3dstools-1.1.4.tar.bz2
-	noextract = picasso-2.6.2.tar.bz2
+	depends = python
+	depends = xz
+	noextract = binutils-2.30.tar.bz2
+	noextract = gcc-8.1.0.tar.xz
+	noextract = newlib-3.0.0.tar.gz
+	noextract = gdb-8.0.tar.xz
 	options = !strip
 	options = libtool
 	options = staticlibs
 	options = emptydirs
-	source = https://github.com/devkitPro/buildscripts/releases/download/v20170715/buildscripts-20170715.tar.bz2
-	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-2.28.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-7.1.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-2.5.0.tar.gz
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-8.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/general-tools-1.0.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gbatools-1.0.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gp32tools-1.0.3.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/dstools-1.1.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/grit-0.8.14.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/ndstool-2.0.3.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/dlditool-1.24.0.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/mmutil-1.8.6.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/dfu-util-0.9.1.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/stlink-1.2.2.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/3dslink-0.5.2.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/3dstools-1.1.4.tar.bz2
-	source = https://github.com/devkitPro/buildscripts/releases/download/sources/picasso-2.6.2.tar.bz2
-	source = devkitarm-skip-libs.patch
-	source = devkitarm-add-patches.patch
+	source = https://github.com/devkitPro/buildscripts/releases/download/v20180514/buildscripts-20180514.tar.bz2
+	source = https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-2.30.tar.bz2
+	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-8.1.0.tar.xz
+	source = https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-3.0.0.tar.gz
+	source = https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-8.0.tar.xz
 	source = devkitarm.sh
 	source = devkitarm.fish
-	sha256sums = e2bfb7363d1504387e33383416d09b4fc7a5753332eb09890872d3456d5ba3d8
-	sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
-	sha256sums = 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
-	sha256sums = 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17
-	sha256sums = 5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
-	sha256sums = ae4b7d082fac39895c18c2e55a1b0554f242689577473f4275908868598139cd
-	sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4
-	sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632
-	sha256sums = 8a376c0c7102753adf69ce3bdc189b306b7df8894181dd515299bd6930b6ed49
-	sha256sums = d36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb
-	sha256sums = 9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6
-	sha256sums = 45fd42cbf95d7d44059748f4af7c94191aff2723a04d249d85fcd60ef3e7dbc3
-	sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f
-	sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e
-	sha256sums = fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e
-	sha256sums = 696127e85fffbfb520ed0f1d8fcc56097f7add88ffc42e70e110032f831ef06f
-	sha256sums = 9b6ada97fd80c4693e5cae77a0376b02cb3964395010f8220468d9b2cd98c475
-	sha256sums = b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3
-	sha256sums = 48da1407d85e11158e62e39f05b9b10498a40e8aec29206ef5b427bde6742b36
-	sha256sums = 743a744a1939040e779f3c660184bd29dde11998761ca9fd6cde6c0759a5d1d7
-	sha256sums = 4909165bef4458415598165a553d70499926ec49a86b79e49d237aceaf7f709b
-	sha256sums = 9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9
-	sha256sums = c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd
+	sha256sums = c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac
+	sha256sums = efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09
+	sha256sums = 1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153
+	sha256sums = c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332
+	sha256sums = f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee
+	sha256sums = 2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0
+	sha256sums = 13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938
 
 pkgname = devkitarm
 
diff --git a/PKGBUILD b/PKGBUILD
index 443c95653f13..cb59a8067d96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,89 +1,36 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=devkitarm
-pkgver=r47
-_buildscriptsver=20170715
-_binutilsver=2.28
-_gccver=7.1.0
-_newlibver=2.5.0
+pkgver=r48
+_buildscriptsver=20180514
+_binutilsver=2.30
+_gccver=8.1.0
+_newlibver=3.0.0
 _gdbver=8.0
-_generaltoolsver=1.0.0
-_islver=0.18
-_gbatoolsver=1.0.0
-_gp32toolsver=1.0.3
-_dstoolsver=1.1.0
-_gritver=0.8.14
-_ndstoolver=2.0.3
-_dlditoolver=1.24.0
-_mmutilver=1.8.6
-_dfuutilver=0.9.1
-_stlinkver=1.2.2
-_3dslinkver=0.5.2
-_3dstoolsver=1.1.4
-_picassover=2.6.2
 pkgrel=1
 pkgdesc="ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://devkitpro.org"
 license=('GPL')
 options=(!strip libtool staticlibs emptydirs)
-depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb')
+depends=('flex' 'libmpc' 'python' 'xz')
 install=devkitarm.install
 source=("https://github.com/devkitPro/buildscripts/releases/download/v$_buildscriptsver/buildscripts-$_buildscriptsver.tar.bz2"
-        "http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
         "https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-$_binutilsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-$_gccver.tar.bz2"
+        "https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-$_gccver.tar.xz"
         "https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-$_newlibver.tar.gz"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-$_gdbver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/general-tools-$_generaltoolsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/gbatools-$_gbatoolsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/gp32tools-$_gp32toolsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/dstools-$_dstoolsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/grit-$_gritver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/ndstool-$_ndstoolver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/dlditool-$_dlditoolver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/mmutil-$_mmutilver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/dfu-util-$_dfuutilver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/stlink-$_stlinkver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/3dslink-$_3dslinkver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/3dstools-$_3dstoolsver.tar.bz2"
-        "https://github.com/devkitPro/buildscripts/releases/download/sources/picasso-$_picassover.tar.bz2"
-        "devkitarm-skip-libs.patch"
-        "devkitarm-add-patches.patch"
+        "https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-$_gdbver.tar.xz"
         "devkitarm.sh"
         "devkitarm.fish")
-sha256sums=('e2bfb7363d1504387e33383416d09b4fc7a5753332eb09890872d3456d5ba3d8'
-            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
-            '6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72'
-            '8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17'
-            '5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b'
-            'ae4b7d082fac39895c18c2e55a1b0554f242689577473f4275908868598139cd'
-            '09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4'
-            '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632'
-            '8a376c0c7102753adf69ce3bdc189b306b7df8894181dd515299bd6930b6ed49'
-            'd36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb'
-            '9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6'
-            '45fd42cbf95d7d44059748f4af7c94191aff2723a04d249d85fcd60ef3e7dbc3'
-            '5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f'
-            '5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e'
-            'fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e'
-            '696127e85fffbfb520ed0f1d8fcc56097f7add88ffc42e70e110032f831ef06f'
-            '9b6ada97fd80c4693e5cae77a0376b02cb3964395010f8220468d9b2cd98c475'
-            'b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3'
-            '48da1407d85e11158e62e39f05b9b10498a40e8aec29206ef5b427bde6742b36'
-            '743a744a1939040e779f3c660184bd29dde11998761ca9fd6cde6c0759a5d1d7'
-            '4909165bef4458415598165a553d70499926ec49a86b79e49d237aceaf7f709b'
-            '9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9'
-            'c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd')
-noextract=("binutils-$_binutilsver.tar.bz2" "gcc-$_gccver.tar.bz2"
-           "newlib-$_newlibver.tar.gz" "gdb-$_gdbver.tar.bz2"
-           "general-tools-$_generaltoolsver.tar.bz2"
-           "gbatools-$_gbatoolsver.tar.bz2" "gp32tools-$_gp32toolsver.tar.bz2"
-           "dstools-$_dstoolsver.tar.bz2" "grit-$_gritver.tar.bz2"
-           "ndstool-$_ndstoolver.tar.bz2" "dlditool-$_dlditoolver.tar.bz2"
-           "mmutil-$_mmutilver.tar.bz2" "dfu-util-$_dfuutilver.tar.bz2"
-           "stlink-$_stlinkver.tar.bz2" "3dslink-$_3dslinkver.tar.bz2"
-           "3dstools-$_3dstoolsver.tar.bz2" "picasso-$_picassover.tar.bz2")
+sha256sums=('c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac'
+            'efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09'
+            '1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153'
+            'c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332'
+            'f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee'
+            '2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0'
+            '13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938')
+noextract=("binutils-$_binutilsver.tar.bz2" "gcc-$_gccver.tar.xz"
+           "newlib-$_newlibver.tar.gz" "gdb-$_gdbver.tar.xz")
 
 prepare() {
   # reset build dir and force reinstalling already built tools
@@ -91,33 +38,28 @@ prepare() {
   [ -d buildscripts/.devkitARM ] && find buildscripts/.devkitARM \
     \( -name "installed-*" -o -name "installed" \) -delete
 
-  # generate config file for automatic build
-  cat << END > buildscripts/config.sh
+  (cd buildscripts
+    # generate config file for automatic build
+    cat << END > config.sh
 #!bin/sh
 BUILD_DKPRO_PACKAGE=1
-BUILD_DKPRO_INSTALLDIR=$PWD/build
-BUILD_DKPRO_SRCDIR=$PWD
+BUILD_DKPRO_INSTALLDIR="$srcdir"/build
+BUILD_DKPRO_SRCDIR="$srcdir"
+BUILD_DKPRO_SKIP_LIBRARIES=1
+BUILD_DKPRO_SKIP_TOOLS=1
 BUILD_DKPRO_AUTOMATED=1
 END
 
-  # fix install of newlib, this is an arch specific bug, that also happens with
-  # other arm cross toolchains + newlib. solution is to do the install again.
-  sed 's/Error installing newlib"; exit 1; }/newlib, second try"; $MAKE install || { echo "& }/' \
-    -i buildscripts/dkarm-eabi/scripts/build-gcc.sh
+    # do not try to download or extract tool packages and libraries
+    sed 's/ \$hostarchives/ ""/g;s/ \$targetarchives/ ""/g' -i build-devkit.sh
 
-  # fix search path to use correct tools
-  sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \
-    buildscripts/build-devkit.sh
+    # do not build gdb with guile support (broken)
+    sed '/gdb/,$ s/--disable-werror/& --with-guile=no/' -i dkarm-eabi/scripts/build-gcc.sh
 
-  # use in-tree isl
-  # disable guile for gdb
-  patch -Np0 < devkitarm-add-patches.patch
-
-  # isl needlessly wants automake-15, upgrading
-  autoreconf -Wnone -fi isl-$_islver
-
-  # disable building of libraries, we have separate packages
-  patch -Np0 < devkitarm-skip-libs.patch
+    # fix search path to use correct tools
+    sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \
+      build-devkit.sh
+  )
 }
 
 build() {
diff --git a/devkitarm-add-patches.patch b/devkitarm-add-patches.patch
deleted file mode 100644
index 8d77947d595d..000000000000
--- a/devkitarm-add-patches.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur buildscripts.orig/build-devkit.sh buildscripts/build-devkit.sh
---- buildscripts.orig/build-devkit.sh	2017-07-15 17:16:44.000000000 +0200
-+++ buildscripts/build-devkit.sh	2017-08-08 18:43:19.034086236 +0200
-@@ -243,6 +243,7 @@
- 
- extract_and_patch binutils $BINUTILS_VER bz2
- extract_and_patch gcc $GCC_VER bz2
-+cp -ru "$SRCDIR/isl-0.18" gcc-$GCC_VER/isl
- extract_and_patch newlib $NEWLIB_VER gz
- extract_and_patch gdb $GDB_VER bz2
- 
-diff -Naur buildscripts.orig/dkarm-eabi/scripts/build-gcc.sh buildscripts/dkarm-eabi/scripts/build-gcc.sh
---- buildscripts.orig/dkarm-eabi/scripts/build-gcc.sh	2017-07-15 17:13:22.000000000 +0200
-+++ buildscripts/dkarm-eabi/scripts/build-gcc.sh	2017-08-08 18:43:50.223433311 +0200
-@@ -57,6 +57,7 @@
- 		--disable-libmudflap --disable-libssp --disable-libgomp \
- 		--disable-libstdcxx-pch \
- 		--target=$target \
-+		--with-isl \
- 		--with-newlib \
- 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
- 		--prefix=$prefix \
-@@ -154,7 +155,7 @@
- 	CXXFLAGS="$cflags" \
- 	LDFLAGS="$ldflags" \
- 	../../gdb-$GDB_VER/configure \
--	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-+	--disable-nls --prefix=$prefix --target=$target --disable-werror --with-guile=no \
- 	$CROSS_PARAMS \
- 	|| { echo "Error configuring gdb"; exit 1; }
- 	touch configured-gdb
diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch
deleted file mode 100644
index 5adf3213a2ef..000000000000
--- a/devkitarm-skip-libs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur buildscripts.orig/build-devkit.sh buildscripts/build-devkit.sh
---- buildscripts.orig/build-devkit.sh	2017-08-08 18:12:26.472785411 +0200
-+++ buildscripts/build-devkit.sh	2017-08-08 18:10:16.248789140 +0200
-@@ -229,7 +229,7 @@
- fi
- 
- cd "$SRCDIR"
--for archive in $archives $targetarchives $hostarchives
-+for archive in $archives $hostarchives
- do
- 	echo $archive
- 	if [ ! -f $archive ]; then
-@@ -251,16 +251,6 @@
- 	extract_and_patch binutils $MN_BINUTILS_VER bz2
- fi
- 
--for archive in $targetarchives
--do
--	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
--	echo $destdir
--	if [ ! -d $destdir ]; then
--		mkdir -p $destdir
--		bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
--	fi
--done
--
- for archive in $hostarchives
- do
- 	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
-diff -Naur buildscripts.orig/dkarm-eabi/scripts/build-crtls.sh buildscripts/dkarm-eabi/scripts/build-crtls.sh
---- buildscripts.orig/dkarm-eabi/scripts/build-crtls.sh	2017-01-21 18:06:09.000000000 +0100
-+++ buildscripts/dkarm-eabi/scripts/build-crtls.sh	2017-08-08 18:10:16.248789140 +0200
-@@ -24,43 +24,3 @@
- $MAKE ds_arm7_vram_crt0
- $MAKE 3dsx_crt0
- 
--cd $BUILDDIR/libgba-$LIBGBA_VER
--$MAKE || { echo "error building libgba"; exit 1; }
--$MAKE install || { echo "error installing libgba"; exit 1; }
--
--cd $BUILDDIR/libnds-$LIBNDS_VER
--$MAKE || { echo "error building libnds"; exit 1; }
--$MAKE install || { echo "error installing libnds"; exit 1; }
--
--cd $BUILDDIR/dswifi-$DSWIFI_VER
--$MAKE || { echo "error building dswifi"; exit 1; }
--$MAKE install || { echo "error installing dswifi"; exit 1; }
--
--cd $BUILDDIR/maxmod-$MAXMOD_VER
--$MAKE || { echo "error building maxmod"; exit 1; }
--$MAKE install || { echo "error installing maxmod"; exit 1; }
--
--cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
--$MAKE || { echo "error building default arm7"; exit 1; }
--$MAKE install || { echo "error installing default arm7"; exit 1; }
--
--cd $BUILDDIR/libfat-$LIBFAT_VER
--$MAKE nds-install || { echo "error building nds libfat"; exit 1; }
--$MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
--
--#cd $BUILDDIR/libmirko-$LIBMIRKO_VER
--#$MAKE || { echo "error building libmirko"; exit 1; }
--#$MAKE install || { echo "error installing libmirko"; exit 1; }
--
--cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
--$MAKE || { echo "error building libfilesystem"; exit 1; }
--$MAKE install || { echo "error installing libfilesystem"; exit 1; }
--
--cd $BUILDDIR/libctru-$LIBCTRU_VER
--$MAKE || { echo "error building libctru"; exit 1; }
--$MAKE install || { echo "error installing libctru"; exit 1; }
--
--cd $BUILDDIR/citro3d-$CITRO3D_VER
--$MAKE || { echo "error building libctru"; exit 1; }
--$MAKE install || { echo "error installing libctru"; exit 1; }
--
diff --git a/devkitarm.fish b/devkitarm.fish
index c028a13d9612..ce33ea104be0 100644
--- a/devkitarm.fish
+++ b/devkitarm.fish
@@ -1,6 +1,3 @@
 # set needed variables
 set -gx DEVKITPRO /opt/devkitpro
 set -gx DEVKITARM $DEVKITPRO/devkitARM
-
-# add to path
-set -gx PATH $PATH $DEVKITARM/bin
diff --git a/devkitarm.install b/devkitarm.install
index 670fc5c0e5b6..a491932d160f 100644
--- a/devkitarm.install
+++ b/devkitarm.install
@@ -6,8 +6,14 @@ post_install() {
   echo "To use the toolchain right away, use"
   echo "  $ source /etc/profile.d/devkitarm.sh     # (for POSIX compatible)"
   echo "  $ source /etc/fish/conf.d/devkitarm.fish # (for fish shell)"
+  echo "You may add \$DEVKITARM/bin to your \$PATH for selected shells."
 }
 
 post_upgrade() {
   post_install
+
+  if [[ $(vercmp "$2" "r47") -ne 1 && $(vercmp "r48" "$1") -ne 1 ]]; then
+    echo "Note: The provided tools are not added to the \$PATH automatically anymore."
+    echo "  This caused problems with other toolchains using the same executable names."
+  fi
 }
diff --git a/devkitarm.sh b/devkitarm.sh
index c97d07583a73..c928cc0623d2 100644
--- a/devkitarm.sh
+++ b/devkitarm.sh
@@ -1,6 +1,3 @@
 # set needed variables
 export DEVKITPRO=/opt/devkitpro
 export DEVKITARM=${DEVKITPRO}/devkitARM
-
-# add to path
-export PATH=${PATH}:${DEVKITARM}/bin