[fix] Change search path to use provided tools

instead of the already installed ones for (re-)builds

3 files changed, 80 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45497445c845..a912991a7332 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = devkitarm
 	pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development
 	pkgver = r42
 	pkgrel = 1
-	url = http://www.devkitpro.org/
+	url = http://www.devkitpro.org
 	install = devkitarm.install
 	arch = i686
 	arch = x86_64
@@ -30,6 +30,7 @@ pkgbase = devkitarm
 	options = !strip
 	options = libtool
 	options = staticlibs
+	options = emptydirs
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20140402.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.24.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.8.2.tar.bz2
@@ -44,6 +45,7 @@ pkgbase = devkitarm
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/mmutil-1.8.6.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-0.7.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.7.tar.bz2
+	source = devkitarm-skip-libs.patch
 	source = devkitarm.sh
 	sha256sums = f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec
 	sha256sums = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
@@ -59,6 +61,7 @@ pkgbase = devkitarm
 	sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e
 	sha256sums = 33a1922cf7fb57c3d80e873dc20cabd550d1285476ab5a0efa4d910aceafd2f0
 	sha256sums = 8ac33627490158ba32c4b18bd8ceba1ac083658c6005c3cbae077045af9f1033
+	sha256sums = 14027a13b9f048c87b5d86e4e60c19eff514feda41cc249cda5a071646b4863a
 	sha256sums = a6f33eaf2d89493f5bb557ef82c6286793c7e69dd3f6de6be85733835b193bd7
 
 pkgname = devkitarm
diff --git a/PKGBUILD b/PKGBUILD
index 95c8436092b9..a570a4f41299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,13 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
-# Contributor: Schnouki <thomas.jost@gmail.com>
-# Contributor: Vithon <ratm@archlinux.us>
-# Contributor: Aaron <aaron@aaronlindsay.com>
-# Contributor: TheGuy <lowelink26381@gmail.com>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=devkitarm
 pkgver=r42
 pkgrel=1
 pkgdesc="An ARM toolchain for GP32, Nintendo DS and GBA homebrew development"
 arch=('i686' 'x86_64')
-url="http://www.devkitpro.org/"
+url="http://www.devkitpro.org"
 license=('GPL')
-options=(!strip libtool staticlibs)
+options=(!strip libtool staticlibs emptydirs)
 depends=('xz' 'freeimage' 'python' 'cloog' 'flex' 'libmpc' 'libusb')
 install=devkitarm.install
 source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20140402.tar.bz2"
@@ -28,6 +24,7 @@ source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-201
         "http://downloads.sourceforge.net/sourceforge/devkitpro/mmutil-1.8.6.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-0.7.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.7.tar.bz2"
+        "devkitarm-skip-libs.patch"
         "devkitarm.sh")
 sha256sums=('f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec'
             'e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137'
@@ -43,6 +40,7 @@ sha256sums=('f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec'
             '5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e'
             '33a1922cf7fb57c3d80e873dc20cabd550d1285476ab5a0efa4d910aceafd2f0'
             '8ac33627490158ba32c4b18bd8ceba1ac083658c6005c3cbae077045af9f1033'
+            '14027a13b9f048c87b5d86e4e60c19eff514feda41cc249cda5a071646b4863a'
             'a6f33eaf2d89493f5bb557ef82c6286793c7e69dd3f6de6be85733835b193bd7')
 noextract=('binutils-2.24.tar.bz2' 'gcc-4.8.2.tar.bz2' 'newlib-2.1.0.tar.gz'
            'gdb-7.7.tar.bz2' 'gbatools-1.0.0.tar.bz2' 'dstools-1.0.0.tar.bz2'
@@ -69,9 +67,12 @@ END
   sed 's/Error installing newlib"; exit 1; }/newlib, second try"; $MAKE install || { echo "& }/' \
     -i buildscripts/dkarm-eabi/scripts/build-gcc.sh
 
+  # fix search path to use correct tools
+  sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \
+    buildscripts/build-devkit.sh
+
   # disable building of libraries, we have seperate packages
-  sed '25,$d' -i buildscripts/dkarm-eabi/scripts/build-crtls.sh
-  sed '239,247d;s|$targetarchives ||' -i buildscripts/build-devkit.sh
+  patch -Np0 < devkitarm-skip-libs.patch
 }
 
 build() {
diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch
new file mode 100644
index 000000000000..fdabcab0524d
--- /dev/null
+++ b/devkitarm-skip-libs.patch
@@ -0,0 +1,66 @@
+diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
+--- buildscripts.old/build-devkit.sh	2014-04-02 23:16:25.000000000 +0200
++++ buildscripts/build-devkit.sh	2014-08-19 02:43:59.867864270 +0200
+@@ -218,7 +218,7 @@
+ fi
+ 
+ cd "$SRCDIR"
+-for archive in $archives $targetarchives $hostarchives
++for archive in $archives $hostarchives
+ do
+ 	echo $archive
+ 	if [ ! -f $archive ]; then
+@@ -236,15 +236,6 @@
+ extract_and_patch newlib $NEWLIB_VER gz
+ extract_and_patch gdb $GDB_VER bz2
+ 
+-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
+diff -Naur buildscripts.old/dkarm-eabi/scripts/build-crtls.sh buildscripts/dkarm-eabi/scripts/build-crtls.sh
+--- buildscripts.old/dkarm-eabi/scripts/build-crtls.sh	2013-01-05 14:10:23.000000000 +0100
++++ buildscripts/dkarm-eabi/scripts/build-crtls.sh	2014-08-19 02:43:51.807763871 +0200
+@@ -22,34 +22,3 @@
+ $MAKE CRT=ds_arm9
+ $MAKE CRT=ds_cart
+ 
+-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; }