[upd] r42→r43

4 files changed, 56 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a912991a7332..45e248775034 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = devkitarm
 	pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development
-	pkgver = r42
+	pkgver = r43
 	pkgrel = 1
 	url = http://www.devkitpro.org
 	install = devkitarm.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = xz
 	depends = freeimage
 	depends = python
-	depends = cloog
 	depends = flex
 	depends = libmpc
 	depends = libusb
 	noextract = binutils-2.24.tar.bz2
-	noextract = gcc-4.8.2.tar.bz2
+	noextract = gcc-4.9.2.tar.bz2
 	noextract = newlib-2.1.0.tar.gz
-	noextract = gdb-7.7.tar.bz2
+	noextract = gdb-7.7.1.tar.bz2
 	noextract = gbatools-1.0.0.tar.bz2
 	noextract = dstools-1.0.0.tar.bz2
 	noextract = grit-0.8.12.tar.bz2
@@ -25,17 +23,18 @@ pkgbase = devkitarm
 	noextract = general-tools-1.0.0.tar.bz2
 	noextract = dlditool-1.24.0.tar.bz2
 	noextract = mmutil-1.8.6.tar.bz2
-	noextract = dfu-util-0.7.tar.bz2
-	noextract = stlink-0.5.7.tar.bz2
+	noextract = dfu-util-0.7.1.tar.bz2
+	noextract = stlink-0.5.8.tar.bz2
+	noextract = 3dstools-1.0.0.tar.bz2
 	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/buildscripts-20141121.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
+	source = http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.9.2.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.1.0.tar.gz
-	source = http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.7.tar.bz2
+	source = http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.7.1.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-1.0.0.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-1.0.0.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/grit-0.8.12.tar.bz2
@@ -43,15 +42,16 @@ pkgbase = devkitarm
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/general-tools-1.0.0.tar.bz2
 	source = http://downloads.sourceforge.net/sourceforge/devkitpro/dlditool-1.24.0.tar.bz2
 	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 = http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-0.7.1.tar.bz2
+	source = http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.8.tar.bz2
+	source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.0.0.tar.bz2
 	source = devkitarm-skip-libs.patch
 	source = devkitarm.sh
-	sha256sums = f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec
+	sha256sums = de5e8443693c7fee99f2b06ef6011bb208ee123f66c80fdf2bc39929af468a6c
 	sha256sums = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-	sha256sums = 09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8
+	sha256sums = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
 	sha256sums = 3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48
-	sha256sums = 0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23
+	sha256sums = 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5
 	sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632
 	sha256sums = 478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220
 	sha256sums = 6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929
@@ -59,10 +59,11 @@ pkgbase = devkitarm
 	sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4
 	sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f
 	sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e
-	sha256sums = 33a1922cf7fb57c3d80e873dc20cabd550d1285476ab5a0efa4d910aceafd2f0
-	sha256sums = 8ac33627490158ba32c4b18bd8ceba1ac083658c6005c3cbae077045af9f1033
-	sha256sums = 14027a13b9f048c87b5d86e4e60c19eff514feda41cc249cda5a071646b4863a
-	sha256sums = a6f33eaf2d89493f5bb557ef82c6286793c7e69dd3f6de6be85733835b193bd7
+	sha256sums = c406878c2bdf5b592b84a125a6184148bd9bf92da014fceaf1e6674449302388
+	sha256sums = f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9
+	sha256sums = 74ebc28c7e8ab369efb36afa711dd801fc850387322e935123d1c92d890a270e
+	sha256sums = 2ffb027cc26d60db4f75ac4888f5fb8a949ea6966235d448c1ffe17261be26b8
+	sha256sums = fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db
 
 pkgname = devkitarm
 
diff --git a/PKGBUILD b/PKGBUILD
index a570a4f41299..0142b82c2375 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=devkitarm
-pkgver=r42
+pkgver=r43
 pkgrel=1
 pkgdesc="An ARM toolchain for GP32, Nintendo DS and GBA homebrew development"
 arch=('i686' 'x86_64')
 url="http://www.devkitpro.org"
 license=('GPL')
 options=(!strip libtool staticlibs emptydirs)
-depends=('xz' 'freeimage' 'python' 'cloog' 'flex' 'libmpc' 'libusb')
+depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb')
 install=devkitarm.install
-source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20140402.tar.bz2"
+source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20141121.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.24.tar.bz2"
-        "http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.8.2.tar.bz2"
+        "http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.9.2.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.1.0.tar.gz"
-        "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.7.tar.bz2"
+        "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.7.1.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-1.0.0.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-1.0.0.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/grit-0.8.12.tar.bz2"
@@ -22,15 +22,16 @@ source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-201
         "http://downloads.sourceforge.net/sourceforge/devkitpro/general-tools-1.0.0.tar.bz2"
         "http://downloads.sourceforge.net/sourceforge/devkitpro/dlditool-1.24.0.tar.bz2"
         "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"
+        "http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-0.7.1.tar.bz2"
+        "http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.8.tar.bz2"
+        "http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.0.0.tar.bz2"
         "devkitarm-skip-libs.patch"
         "devkitarm.sh")
-sha256sums=('f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec'
+sha256sums=('de5e8443693c7fee99f2b06ef6011bb208ee123f66c80fdf2bc39929af468a6c'
             'e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137'
-            '09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8'
+            '2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd'
             '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48'
-            '0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23'
+            '0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5'
             '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632'
             '478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220'
             '6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929'
@@ -38,15 +39,16 @@ sha256sums=('f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec'
             '09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4'
             '5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f'
             '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'
+            'c406878c2bdf5b592b84a125a6184148bd9bf92da014fceaf1e6674449302388'
+            'f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9'
+            '74ebc28c7e8ab369efb36afa711dd801fc850387322e935123d1c92d890a270e'
+            '2ffb027cc26d60db4f75ac4888f5fb8a949ea6966235d448c1ffe17261be26b8'
+            'fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db')
+noextract=('binutils-2.24.tar.bz2' 'gcc-4.9.2.tar.bz2' 'newlib-2.1.0.tar.gz'
+           'gdb-7.7.1.tar.bz2' 'gbatools-1.0.0.tar.bz2' 'dstools-1.0.0.tar.bz2'
            'grit-0.8.12.tar.bz2' 'ndstool-1.50.1.tar.bz2' 'general-tools-1.0.0.tar.bz2'
-           'dlditool-1.24.0.tar.bz2' 'mmutil-1.8.6.tar.bz2' 'dfu-util-0.7.tar.bz2'
-           'stlink-0.5.7.tar.bz2')
+           'dlditool-1.24.0.tar.bz2' 'mmutil-1.8.6.tar.bz2' 'dfu-util-0.7.1.tar.bz2'
+           'stlink-0.5.8.tar.bz2' '3dstools-1.0.0.tar.bz2')
 
 prepare() {
   # reset build dir
@@ -71,7 +73,7 @@ END
   sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \
     buildscripts/build-devkit.sh
 
-  # disable building of libraries, we have seperate packages
+  # disable building of libraries, we have separate packages
   patch -Np0 < devkitarm-skip-libs.patch
 }
 
diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch
index fdabcab0524d..c4e6542866af 100644
--- a/devkitarm-skip-libs.patch
+++ b/devkitarm-skip-libs.patch
@@ -1,7 +1,7 @@
 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 @@
+--- buildscripts.old/build-devkit.sh	2014-11-21 18:55:02.000000000 +0100
++++ buildscripts/build-devkit.sh	2014-11-23 13:31:04.702390386 +0100
+@@ -220,7 +220,7 @@
  fi
  
  cd "$SRCDIR"
@@ -10,7 +10,7 @@ diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
  do
  	echo $archive
  	if [ ! -f $archive ]; then
-@@ -236,15 +236,6 @@
+@@ -238,15 +238,6 @@
  extract_and_patch newlib $NEWLIB_VER gz
  extract_and_patch gdb $GDB_VER bz2
  
@@ -27,12 +27,13 @@ diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
  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 @@
+--- buildscripts.old/dkarm-eabi/scripts/build-crtls.sh	2014-11-21 10:44:39.000000000 +0100
++++ buildscripts/dkarm-eabi/scripts/build-crtls.sh	2014-11-23 13:35:57.892675791 +0100
+@@ -22,40 +22,3 @@
  $MAKE CRT=ds_arm9
  $MAKE CRT=ds_cart
- 
+ $MAKE CRT=3dsx
+-
 -cd $BUILDDIR/libgba-$LIBGBA_VER
 -$MAKE || { echo "error building libgba"; exit 1; }
 -$MAKE install || { echo "error installing libgba"; exit 1; }
@@ -64,3 +65,8 @@ diff -Naur buildscripts.old/dkarm-eabi/scripts/build-crtls.sh buildscripts/dkarm
 -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; }
+-
diff --git a/devkitarm.sh b/devkitarm.sh
index 04f5e843746d..a2110702d32c 100644
--- a/devkitarm.sh
+++ b/devkitarm.sh
@@ -1,5 +1,5 @@
 
-# allow per-user override
+# allow override
 if [ -z $DEVKITPRO ]; then
   export DEVKITPRO=/opt/devkitpro
 fi