summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2017-02-05 16:51:57 +0100
committerCarsten Teibes2017-02-05 16:51:57 +0100
commitdea1bbe035d5ab0288a6a0389e4334c4f3b0c80a (patch)
tree128792d5bcb0ab9a9bb61337f1234742bb2fa2b5
parentfd50f354c5dcda3866eb30b7654db93830b0e8ce (diff)
downloadaur-dea1bbe035d5ab0288a6a0389e4334c4f3b0c80a.tar.gz
[upd] r45→r46
-rw-r--r--.SRCINFO110
-rw-r--r--PKGBUILD145
-rw-r--r--devkitarm-add-tool-patches.patch13
-rw-r--r--devkitarm-skip-libs.patch39
-rw-r--r--devkitarm-use-in-tree-isl.patch22
-rw-r--r--devkitarm.fish6
-rw-r--r--devkitarm.install9
-rw-r--r--devkitarm.sh14
-rw-r--r--fix-gcc-5.3.0-compilation-on-gcc-6.patch163
-rw-r--r--fix-gp32tools.patch42
-rw-r--r--fix-grit.patch40
11 files changed, 198 insertions, 405 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 039665573d2c..8daf6f6006bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = devkitarm
- pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development
- pkgver = r45
- pkgrel = 2
- url = http://www.devkitpro.org
+ pkgdesc = ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development
+ pkgver = r46
+ pkgrel = 1
+ url = http://devkitpro.org
install = devkitarm.install
arch = i686
arch = x86_64
@@ -13,77 +13,73 @@ pkgbase = devkitarm
depends = libmpc
depends = libusb
depends = guile
- noextract = binutils-2.25.1.tar.bz2
- noextract = gcc-5.3.0.tar.bz2
- noextract = newlib-2.2.0.tar.gz
- noextract = gdb-7.10.tar.bz2
- noextract = gbatools-1.0.0.tar.bz2
- noextract = gp32tools-1.0.1.tar.bz2
- noextract = dstools-1.0.2.tar.bz2
- noextract = grit-0.8.13.tar.bz2
- noextract = ndstool-1.50.3.tar.bz2
+ noextract = binutils-2.27.tar.bz2
+ noextract = gcc-6.3.0.tar.bz2
+ noextract = newlib-2.5.0.tar.gz
+ noextract = gdb-7.12.tar.bz2
noextract = general-tools-1.0.0.tar.bz2
+ noextract = gbatools-1.0.0.tar.bz2
+ noextract = gp32tools-1.0.2.tar.bz2
+ noextract = dstools-1.1.0.tar.bz2
+ noextract = grit-0.8.14.tar.bz2
+ noextract = ndstool-2.0.1.tar.bz2
noextract = dlditool-1.24.0.tar.bz2
noextract = mmutil-1.8.6.tar.bz2
- noextract = dfu-util-0.8.1.tar.bz2
- noextract = stlink-0.5.8.tar.bz2
+ noextract = dfu-util-0.9.1.tar.bz2
+ noextract = stlink-1.2.1.tar.bz2
noextract = 3dslink-0.5.1.tar.bz2
- noextract = 3dstools-1.1.1.tar.bz2
- noextract = picasso-2.1.0.tar.bz2
+ noextract = 3dstools-1.1.4.tar.bz2
+ noextract = picasso-2.5.0.tar.bz2
options = !strip
options = libtool
options = staticlibs
options = emptydirs
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20151213.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.1.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-5.3.0.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.2.0.tar.gz
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.10.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-1.0.0.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/gp32tools-1.0.1.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-1.0.2.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/grit-0.8.13.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.3.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20170126.tar.bz2
+ source = http://isl.gforge.inria.fr/isl-0.16.1.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.27.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-6.3.0.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.5.0.tar.gz
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.12.tar.bz2
source = http://downloads.sourceforge.net/sourceforge/devkitpro/general-tools-1.0.0.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-1.0.0.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/gp32tools-1.0.2.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-1.1.0.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/grit-0.8.14.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-2.0.1.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.8.1.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.8.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-0.9.1.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-1.2.1.tar.bz2
source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.1.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.1.1.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-2.1.0.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.1.4.tar.bz2
+ source = http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-2.5.0.tar.bz2
source = devkitarm-skip-libs.patch
- source = devkitarm-add-gcc-patch.patch
- source = devkitarm-add-tool-patches.patch
- source = fix-gcc-5.3.0-compilation-on-gcc-6.patch
- source = fix-grit.patch
- source = fix-gp32tools.patch
+ source = devkitarm-use-in-tree-isl.patch
source = devkitarm.sh
- sha256sums = dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818
- sha256sums = b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22
- sha256sums = b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db
- sha256sums = f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be
- sha256sums = 06e9f1a56a993f759e63563cd293fd222a8c8e89b70074f1800f5e1976f93a40
- sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632
- sha256sums = 6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413
- sha256sums = 96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2
- sha256sums = 052d52082e9aed9c9e7e60870dcc024d5473e437a73fb5ef0329acf794f8a4e8
- sha256sums = 674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862
+ source = devkitarm.fish
+ sha256sums = 6b142f265bc9c7fc9449f5b539198f140d231725b2ed0828749d8a1e0fad73ff
+ sha256sums = 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
+ sha256sums = 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+ sha256sums = f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
+ sha256sums = 5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
+ sha256sums = dca6461fb6c78a662766d54580737e643b4b6dc43c26a197a8e9d7cb58872de2
sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4
+ sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632
+ sha256sums = 2a4adcd1ea1359fe401fde63384c553513ecc789a3ce1cf61c0d5ed7828edf9f
+ sha256sums = d36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb
+ sha256sums = 9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6
+ sha256sums = 164d41e4499a9079ca7bf3b2feae8dbd3b8a599cc81164e8160462d47f762423
sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f
sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e
- sha256sums = 2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1
- sha256sums = f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9
+ sha256sums = fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e
+ sha256sums = fb8b9cc974849e074a9e8694d62c383ffee6470e17459178de23d215f16bc57a
sha256sums = 056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95
- sha256sums = 6dbf15bb5cbeee826b6ffc608288f1267ed3696d725956943545c0572401d548
- sha256sums = 79bf84b42da964918f6c8bb1294434ed1e10feab9a2b1f5a0183030637977650
- sha256sums = 97b498aa26aba743e141115cd8f1169aa8411532f589c3c845233a299f5ecf74
- sha256sums = 6462b0911186b1b0167c74e2b146d7c09b17974c021ce37087e8c157b6cdd59f
- sha256sums = 27353ac1375867b8d07889a35515e144f3f989588fec4364adc6c5317d17ae4f
- sha256sums = e22c5cb2748a8a62eacbd9401fcdd7a1239a469ab7811382e7564e7554ce2341
- sha256sums = e8fd36de318e8a2726c24d7de0190e475da628456380032a708e0ab232d5e091
- sha256sums = fce6e900ee23ebe0bdee1e6f58e02ba521598f5a1a74eb5798ee35ca1f27be3b
- sha256sums = fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db
+ sha256sums = b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3
+ sha256sums = 2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d
+ sha256sums = 3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d
+ sha256sums = df823a3344aa91ce8f2fa706c9918f95a99e71e0c65f0d281c8e59cef858280a
+ sha256sums = 9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9
+ sha256sums = c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd
pkgname = devkitarm
diff --git a/PKGBUILD b/PKGBUILD
index dd9e618bfcfb..62f74afce87e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,94 @@
# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
pkgname=devkitarm
-pkgver=r45
-pkgrel=2
-pkgdesc="An ARM toolchain for GP32, Nintendo DS and GBA homebrew development"
+pkgver=r46
+_binutilsver=2.27
+_gccver=6.3.0
+_newlibver=2.5.0
+_gdbver=7.12
+_generaltoolsver=1.0.0
+_islver=0.16.1
+_gbatoolsver=1.0.0
+_gp32toolsver=1.0.2
+_dstoolsver=1.1.0
+_gritver=0.8.14
+_ndstoolver=2.0.1
+_dlditoolver=1.24.0
+_mmutilver=1.8.6
+_dfuutilver=0.9.1
+_stlinkver=1.2.1
+_3dslinkver=0.5.1
+_3dstoolsver=1.1.4
+_picassover=2.5.0
+pkgrel=1
+pkgdesc="ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development"
arch=('i686' 'x86_64')
-url="http://www.devkitpro.org"
+url="http://devkitpro.org"
license=('GPL')
options=(!strip libtool staticlibs emptydirs)
depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb' 'guile')
install=devkitarm.install
-source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20151213.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.1.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-5.3.0.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.2.0.tar.gz"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.10.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-1.0.0.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/gp32tools-1.0.1.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-1.0.2.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/grit-0.8.13.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.3.tar.bz2"
- "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.8.1.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.8.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.1.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.1.1.tar.bz2"
- "http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-2.1.0.tar.bz2"
+source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20170126.tar.bz2"
+ "http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-$_binutilsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-$_gccver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-$_newlibver.tar.gz"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-$_gdbver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/general-tools-$_generaltoolsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/gbatools-$_gbatoolsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/gp32tools-$_gp32toolsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/dstools-$_dstoolsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/grit-$_gritver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-$_ndstoolver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/dlditool-$_dlditoolver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/mmutil-$_mmutilver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/dfu-util-$_dfuutilver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-$_stlinkver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-$_3dslinkver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-$_3dstoolsver.tar.bz2"
+ "http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-$_picassover.tar.bz2"
"devkitarm-skip-libs.patch"
- "devkitarm-add-gcc-patch.patch"
- "devkitarm-add-tool-patches.patch"
- "fix-gcc-5.3.0-compilation-on-gcc-6.patch"
- "fix-grit.patch"
- "fix-gp32tools.patch"
- "devkitarm.sh")
-sha256sums=('dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818'
- 'b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22'
- 'b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db'
- 'f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be'
- '06e9f1a56a993f759e63563cd293fd222a8c8e89b70074f1800f5e1976f93a40'
- '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632'
- '6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413'
- '96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2'
- '052d52082e9aed9c9e7e60870dcc024d5473e437a73fb5ef0329acf794f8a4e8'
- '674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862'
+ "devkitarm-use-in-tree-isl.patch"
+ "devkitarm.sh"
+ "devkitarm.fish")
+sha256sums=('6b142f265bc9c7fc9449f5b539198f140d231725b2ed0828749d8a1e0fad73ff'
+ '412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2'
+ '369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88'
+ 'f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f'
+ '5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b'
+ 'dca6461fb6c78a662766d54580737e643b4b6dc43c26a197a8e9d7cb58872de2'
'09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4'
+ '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632'
+ '2a4adcd1ea1359fe401fde63384c553513ecc789a3ce1cf61c0d5ed7828edf9f'
+ 'd36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb'
+ '9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6'
+ '164d41e4499a9079ca7bf3b2feae8dbd3b8a599cc81164e8160462d47f762423'
'5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f'
'5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e'
- '2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1'
- 'f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9'
+ 'fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e'
+ 'fb8b9cc974849e074a9e8694d62c383ffee6470e17459178de23d215f16bc57a'
'056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95'
- '6dbf15bb5cbeee826b6ffc608288f1267ed3696d725956943545c0572401d548'
- '79bf84b42da964918f6c8bb1294434ed1e10feab9a2b1f5a0183030637977650'
- '97b498aa26aba743e141115cd8f1169aa8411532f589c3c845233a299f5ecf74'
- '6462b0911186b1b0167c74e2b146d7c09b17974c021ce37087e8c157b6cdd59f'
- '27353ac1375867b8d07889a35515e144f3f989588fec4364adc6c5317d17ae4f'
- 'e22c5cb2748a8a62eacbd9401fcdd7a1239a469ab7811382e7564e7554ce2341'
- 'e8fd36de318e8a2726c24d7de0190e475da628456380032a708e0ab232d5e091'
- 'fce6e900ee23ebe0bdee1e6f58e02ba521598f5a1a74eb5798ee35ca1f27be3b'
- 'fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db')
-noextract=('binutils-2.25.1.tar.bz2' 'gcc-5.3.0.tar.bz2' 'newlib-2.2.0.tar.gz'
- 'gdb-7.10.tar.bz2' 'gbatools-1.0.0.tar.bz2' 'gp32tools-1.0.1.tar.bz2'
- 'dstools-1.0.2.tar.bz2' 'grit-0.8.13.tar.bz2' 'ndstool-1.50.3.tar.bz2'
- 'general-tools-1.0.0.tar.bz2' 'dlditool-1.24.0.tar.bz2' 'mmutil-1.8.6.tar.bz2'
- 'dfu-util-0.8.1.tar.bz2' 'stlink-0.5.8.tar.bz2' '3dslink-0.5.1.tar.bz2'
- '3dstools-1.1.1.tar.bz2' 'picasso-2.1.0.tar.bz2')
+ 'b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3'
+ '2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d'
+ '3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d'
+ 'df823a3344aa91ce8f2fa706c9918f95a99e71e0c65f0d281c8e59cef858280a'
+ '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")
prepare() {
- # reset build dir
+ # reset build dir and force reinstalling already built tools
rm -rf build
+ [ -d buildscripts/.devkitARM ] && find buildscripts/.devkitARM \
+ \( -name "installed-*" -o -name "installed" \) -delete
# generate config file for automatic build
cat << END > buildscripts/config.sh
@@ -89,11 +108,13 @@ END
sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \
buildscripts/build-devkit.sh
- # add patch to build gcc 5.3.0 on gcc >6
- patch -Np0 < devkitarm-add-gcc-patch.patch
+ # use in-tree isl
+ patch -Np0 < devkitarm-use-in-tree-isl.patch
+ # isl needlessly wants automake-14, upgrading
+ autoreconf -Wnone -fi isl-$_islver
- # add patch to build tools on gcc >6
- patch -Np0 < devkitarm-add-tool-patches.patch
+ # update gp32tools
+ sed 's/GP32_TOOLS_VER=1.0.1/GP32_TOOLS_VER=1.0.2/' -i buildscripts/build-devkit.sh
# disable building of libraries, we have separate packages
patch -Np0 < devkitarm-skip-libs.patch
@@ -110,6 +131,10 @@ build() {
package() {
install -d "$pkgdir"/opt/devkitpro
cp -r build/devkitARM "$pkgdir"/opt/devkitpro
+ # gzip manually, as makepkg only cares for standard directories
+ gzip "$pkgdir"/opt/devkitpro/devkitARM/share/man/man*/*
+ gzip "$pkgdir"/opt/devkitpro/devkitARM/share/info/*
# export environment variables
install -Dm755 devkitarm.sh "$pkgdir"/etc/profile.d/devkitarm.sh
+ install -Dm644 devkitarm.fish "$pkgdir"/etc/fish/conf.d/devkitarm.fish
}
diff --git a/devkitarm-add-tool-patches.patch b/devkitarm-add-tool-patches.patch
deleted file mode 100644
index 27167d474931..000000000000
--- a/devkitarm-add-tool-patches.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur buildscripts.old/dkarm-eabi/scripts/build-tools.sh buildscripts/dkarm-eabi/scripts/build-tools.sh
---- buildscripts.old/dkarm-eabi/scripts/build-tools.sh 2016-11-27 21:58:43.449895511 +0100
-+++ buildscripts/dkarm-eabi/scripts/build-tools.sh 2016-11-27 23:43:07.699791078 +0100
-@@ -1,6 +1,9 @@
- #!/bin/bash
- cd $BUILDDIR
-
-+patch -Np1 -d grit-0.8.13 < ../../fix-grit.patch
-+patch -Np0 < ../../fix-gp32tools.patch
-+
- for archive in $hostarchives
- do
- dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch
index e012f23777bf..795656682e77 100644
--- a/devkitarm-skip-libs.patch
+++ b/devkitarm-skip-libs.patch
@@ -1,7 +1,7 @@
-diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh
---- buildscripts/build-devkit.sh 2015-12-13 01:14:48.000000000 +0100
-+++ buildscripts.no-libs/build-devkit.sh 2015-12-13 14:07:28.118134277 +0100
-@@ -228,7 +228,7 @@
+diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
+--- buildscripts.old/build-devkit.sh 2017-01-25 20:10:12.000000000 +0100
++++ buildscripts/build-devkit.sh 2017-02-05 03:44:47.323301185 +0100
+@@ -218,7 +218,7 @@
fi
cd "$SRCDIR"
@@ -10,9 +10,9 @@ diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh
do
echo $archive
if [ ! -f $archive ]; then
-@@ -246,16 +246,6 @@
- extract_and_patch newlib $NEWLIB_VER gz
- extract_and_patch gdb $GDB_VER bz2
+@@ -239,16 +239,6 @@
+ extract_and_patch binutils $MN_BINUTILS_VER bz2
+ fi
-for archive in $targetarchives
-do
@@ -27,14 +27,13 @@ diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh
for archive in $hostarchives
do
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
-diff -Naur buildscripts/dkarm-eabi/scripts/build-crtls.sh buildscripts.no-libs/dkarm-eabi/scripts/build-crtls.sh
---- buildscripts/dkarm-eabi/scripts/build-crtls.sh 2015-02-15 17:25:19.000000000 +0100
-+++ buildscripts.no-libs/dkarm-eabi/scripts/build-crtls.sh 2015-12-13 14:07:28.121467658 +0100
-@@ -22,40 +22,3 @@
- $MAKE CRT=ds_arm9
- $MAKE CRT=ds_cart
- $target-gcc -march=armv6k -mfloat-abi=hard -c 3dsx_crt0.s -o armv6k/fpu/3dsx_crt0.o
--
+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 2017-01-25 17:51:43.000000000 +0100
++++ buildscripts/dkarm-eabi/scripts/build-crtls.sh 2017-02-05 03:45:21.605867639 +0100
+@@ -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; }
@@ -59,9 +58,9 @@ diff -Naur buildscripts/dkarm-eabi/scripts/build-crtls.sh buildscripts.no-libs/d
-$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/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; }
@@ -71,3 +70,7 @@ diff -Naur buildscripts/dkarm-eabi/scripts/build-crtls.sh buildscripts.no-libs/d
-$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-use-in-tree-isl.patch b/devkitarm-use-in-tree-isl.patch
new file mode 100644
index 000000000000..f9e306842039
--- /dev/null
+++ b/devkitarm-use-in-tree-isl.patch
@@ -0,0 +1,22 @@
+diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
+--- buildscripts.old/build-devkit.sh 2017-01-25 20:10:12.000000000 +0100
++++ buildscripts/build-devkit.sh 2017-02-05 16:07:43.806595927 +0100
+@@ -232,6 +232,7 @@
+
+ extract_and_patch binutils $BINUTILS_VER bz2
+ extract_and_patch gcc $GCC_VER bz2
++cp -ru "$SRCDIR/isl-0.16.1" gcc-$GCC_VER/isl
+ extract_and_patch newlib $NEWLIB_VER gz
+ extract_and_patch gdb $GDB_VER bz2
+
+diff -Naur buildscripts.old/dkppc/scripts/build-gcc.sh buildscripts/dkppc/scripts/build-gcc.sh
+--- buildscripts.old/dkppc/scripts/build-gcc.sh 2017-01-25 17:52:19.000000000 +0100
++++ buildscripts/dkppc/scripts/build-gcc.sh 2017-02-05 16:09:55.534185567 +0100
+@@ -91,6 +91,7 @@
+ --disable-libstdcxx-verbose \
+ --enable-cxx-flags='-ffunction-sections -fdata-sections' \
+ --target=$target \
++ --with-isl \
+ --with-newlib \
+ --with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
+ --prefix=$prefix\
diff --git a/devkitarm.fish b/devkitarm.fish
new file mode 100644
index 000000000000..c028a13d9612
--- /dev/null
+++ b/devkitarm.fish
@@ -0,0 +1,6 @@
+# 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 51f2ee3f7d38..670fc5c0e5b6 100644
--- a/devkitarm.install
+++ b/devkitarm.install
@@ -1,8 +1,11 @@
post_install() {
- echo "To use the toolchain right away, you have to set the environment variables in"
- echo "your currently running shells by executing 'source /etc/profile.d/devkitarm.sh'!"
- echo "This is done automatically for every shell opened from now on."
+ echo "To use the toolchain, environment variables have to be set in your shell."
+ echo "Files setting them for POSIX compatible shells (bash, zsh, ...) and fish are"
+ echo "provided and should be used automatically for shells opened from now on."
+ 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)"
}
post_upgrade() {
diff --git a/devkitarm.sh b/devkitarm.sh
index a2110702d32c..c97d07583a73 100644
--- a/devkitarm.sh
+++ b/devkitarm.sh
@@ -1,10 +1,6 @@
+# set needed variables
+export DEVKITPRO=/opt/devkitpro
+export DEVKITARM=${DEVKITPRO}/devkitARM
-# allow override
-if [ -z $DEVKITPRO ]; then
- export DEVKITPRO=/opt/devkitpro
-fi
-export DEVKITARM=$DEVKITPRO/devkitARM
-
-# add to paths
-export PATH=$PATH:$DEVKITARM/bin
-export MANPATH=$MANPATH:$DEVKITARM/man
+# add to path
+export PATH=${PATH}:${DEVKITARM}/bin
diff --git a/fix-gcc-5.3.0-compilation-on-gcc-6.patch b/fix-gcc-5.3.0-compilation-on-gcc-6.patch
deleted file mode 100644
index 7be4ecd27077..000000000000
--- a/fix-gcc-5.3.0-compilation-on-gcc-6.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 0adb418f0df38077add871fd62ce8cddda76d8de Mon Sep 17 00:00:00 2001
-From: Carsten Teibes <dev@f4ke.de>
-Date: Sun, 27 Nov 2016 22:49:52 +0100
-Subject: [PATCH] Fix gcc 5.3.0 compilation on gcc 6
-
-* Use C++ for invoking gperf
-* Do not inline hash and libc_name_p
-
-Based on upstream patch (adapted to apply cleanly):
-https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=ec1cc0263f156f70693a62cf17b254a0029f4852
----
- gcc/cp/ChangeLog | 9 +++++++++
- gcc/cp/Make-lang.in | 2 +-
- gcc/cp/cfns.gperf | 10 ++--------
- gcc/cp/cfns.h | 41 ++++++++++++++---------------------------
- gcc/cp/except.c | 3 ++-
- 5 files changed, 28 insertions(+), 37 deletions(-)
-
-diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
-index 3477397..be77231 100644
---- a/gcc/cp/ChangeLog
-+++ b/gcc/cp/ChangeLog
-@@ -1,3 +1,12 @@
-+2016-02-19 Jakub Jelinek <jakub@redhat.com>
-+ Bernd Edlinger <bernd.edlinger@hotmail.de>
-+
-+ * Make-lang.in: Invoke gperf with -L C++.
-+ * cfns.gperf: Remove prototypes for hash and libc_name_p
-+ inlines.
-+ * cfns.h: Regenerated.
-+ * except.c (nothrow_libfn_p): Adjust.
-+
- 2015-12-04 Release Manager
-
- * GCC 5.3.0 released.
-diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
-index e98beb1..b09fb02 100644
---- a/gcc/cp/Make-lang.in
-+++ b/gcc/cp/Make-lang.in
-@@ -111,7 +111,7 @@ else
- # deleting the $(srcdir)/cp/cfns.h file.
- $(srcdir)/cp/cfns.h:
- endif
-- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
- $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
-
- #
-diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
-index 68acd3d..214ecf6 100644
---- a/gcc/cp/cfns.gperf
-+++ b/gcc/cp/cfns.gperf
-@@ -1,3 +1,5 @@
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
-diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
-index 1c6665d..596f413 100644
---- a/gcc/cp/cfns.h
-+++ b/gcc/cp/cfns.h
-@@ -1,5 +1,5 @@
--/* ANSI-C code produced by gperf version 3.0.3 */
--/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */
-+/* C++ code produced by gperf version 3.0.4 */
-+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */
-
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -28,7 +28,7 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
-
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
-
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
-
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+ static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+ static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
- static const unsigned short asso_values[] =
- {
-@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len)
- return hval + asso_values[(unsigned char)str[len - 1]];
- }
-
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
- enum
- {
-diff --git a/gcc/cp/except.c b/gcc/cp/except.c
-index 3ff1ce6..2f2e396 100644
---- a/gcc/cp/except.c
-+++ b/gcc/cp/except.c
-@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn)
- unless the system headers are playing rename tricks, and if
- they are, we don't want to be confused by them. */
- id = DECL_NAME (fn);
-- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+ IDENTIFIER_LENGTH (id));
- }
-
- /* Returns nonzero if an exception of type FROM will be caught by a
---
-2.10.2
-
diff --git a/fix-gp32tools.patch b/fix-gp32tools.patch
deleted file mode 100644
index 79efe85f8c5e..000000000000
--- a/fix-gp32tools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur gp32tools-1.0.1.old/src/b2fxec/compress_fxe0.cpp gp32tools-1.0.1/src/b2fxec/compress_fxe0.cpp
---- gp32tools-1.0.1.old/src/b2fxec/compress_fxe0.cpp 2014-12-22 00:56:00.000000000 +0100
-+++ gp32tools-1.0.1/src/b2fxec/compress_fxe0.cpp 2016-10-30 22:18:41.015165705 +0100
-@@ -22,8 +22,8 @@
- // Sort into descending order..
-
- int litcomp( const void* a, const void* b ) {
-- return reinterpret_cast<const literals*>(b)->count -
-- reinterpret_cast<const literals*>(a)->count;
-+ return reinterpret_cast<const struct literals*>(b)->count -
-+ reinterpret_cast<const struct literals*>(a)->count;
- }
- };
-
-diff -Naur gp32tools-1.0.1.old/src/b2fxec/compress_fxe2.cpp gp32tools-1.0.1/src/b2fxec/compress_fxe2.cpp
---- gp32tools-1.0.1.old/src/b2fxec/compress_fxe2.cpp 2014-12-22 00:56:00.000000000 +0100
-+++ gp32tools-1.0.1/src/b2fxec/compress_fxe2.cpp 2016-10-30 22:18:28.351643844 +0100
-@@ -23,8 +23,8 @@
- // Sort into descending order..
-
- int litcomp( const void* a, const void* b ) {
-- return reinterpret_cast<const literals*>(b)->count -
-- reinterpret_cast<const literals*>(a)->count;
-+ return reinterpret_cast<const struct literals*>(b)->count -
-+ reinterpret_cast<const struct literals*>(a)->count;
- }
- };
-
-diff -Naur gp32tools-1.0.1.old/src/b2fxec/compress_fxe3.cpp gp32tools-1.0.1/src/b2fxec/compress_fxe3.cpp
---- gp32tools-1.0.1.old/src/b2fxec/compress_fxe3.cpp 2014-12-22 00:56:00.000000000 +0100
-+++ gp32tools-1.0.1/src/b2fxec/compress_fxe3.cpp 2016-10-30 22:18:12.824746032 +0100
-@@ -23,8 +23,8 @@
- // Sort into descending order..
-
- int litcomp( const void* a, const void* b ) {
-- return reinterpret_cast<const literals*>(b)->count -
-- reinterpret_cast<const literals*>(a)->count;
-+ return reinterpret_cast<const struct literals*>(b)->count -
-+ reinterpret_cast<const struct literals*>(a)->count;
- }
- };
-
diff --git a/fix-grit.patch b/fix-grit.patch
deleted file mode 100644
index 186091eee698..000000000000
--- a/fix-grit.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cd792af5f92da6dfa00b0ed32126e6ccd17619b1 Mon Sep 17 00:00:00 2001
-From: Dave Murphy <davem@devkitpro.org>
-Date: Sat, 17 Sep 2016 15:58:04 +0100
-Subject: [PATCH] return NULL rather than false
-
----
- cldib/cldib_conv.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cldib/cldib_conv.cpp b/cldib/cldib_conv.cpp
-index d0db746..11c2967 100644
---- a/cldib/cldib_conv.cpp
-+++ b/cldib/cldib_conv.cpp
-@@ -179,7 +179,7 @@ CLDIB *dib_bit_unpack_copy(CLDIB *src, int dstB, DWORD base)
- CLDIB *dst= dib_alloc(srcW, srcH, dstB, NULL, dib_is_topdown(src));
-
- if(dst==NULL)
-- return false;
-+ return NULL;
-
- BYTE *srcD= dib_get_img(src), *dstD= dib_get_img(dst);
-
-@@ -256,7 +256,7 @@ CLDIB *dib_8_to_true_copy(CLDIB *src, int dstB)
- CLDIB *dst= dib_alloc(srcW, srcH, dstB, NULL, dib_is_topdown(src));
-
- if(dst==NULL)
-- return false;
-+ return NULL;
-
- BYTE *srcD= dib_get_img(src), *dstD= dib_get_img(dst);
-
-@@ -301,7 +301,7 @@ CLDIB *dib_true_to_true_copy(CLDIB *src, int dstB)
- CLDIB *dst= dib_alloc(srcW, srcH, dstB, NULL, dib_is_topdown(src));
-
- if(dst==NULL)
-- return false;
-+ return NULL;
-
- BYTE *srcD= dib_get_img(src), *dstD= dib_get_img(dst);
-