summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2017-08-08 19:33:33 +0200
committerCarsten Teibes2017-08-08 19:33:33 +0200
commite0b4418b65bf20d80e9ee1074865651b3772082d (patch)
tree5a6014e3a0b350aab6e43c0970248ba87a22355f
parent635fc20f0822a4b39325db9cb788ac02c737631e (diff)
downloadaur-e0b4418b65bf20d80e9ee1074865651b3772082d.tar.gz
[upd] r46→r47
-rw-r--r--.SRCINFO85
-rw-r--r--PKGBUILD93
-rw-r--r--devkitarm-add-patches.patch20
-rw-r--r--devkitarm-skip-libs.patch16
-rw-r--r--fix-gcc-6.3.0-compilation-on-gcc-7.patch28
-rw-r--r--fix-gdb-7.12-compilation-on-gcc-7.patch32
6 files changed, 99 insertions, 175 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee322a1189a4..e47a0209a217 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = devkitarm
pkgdesc = ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development
- pkgver = r46
+ pkgver = r47
pkgrel = 1
url = http://devkitpro.org
install = devkitarm.install
@@ -12,76 +12,71 @@ pkgbase = devkitarm
depends = flex
depends = libmpc
depends = libusb
- depends = guile
- noextract = binutils-2.27.tar.bz2
- noextract = gcc-6.3.0.tar.bz2
+ noextract = binutils-2.28.tar.bz2
+ noextract = gcc-7.1.0.tar.bz2
noextract = newlib-2.5.0.tar.gz
- noextract = gdb-7.12.tar.bz2
+ 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.2.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.1.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.1.tar.bz2
- noextract = 3dslink-0.5.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.5.0.tar.bz2
+ noextract = picasso-2.6.2.tar.bz2
options = !strip
options = libtool
options = staticlibs
options = emptydirs
- 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.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.4.tar.bz2
- source = http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-2.5.0.tar.bz2
+ 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 = fix-gcc-6.3.0-compilation-on-gcc-7.patch
- source = fix-gdb-7.12-compilation-on-gcc-7.patch
source = devkitarm.sh
source = devkitarm.fish
- sha256sums = 6b142f265bc9c7fc9449f5b539198f140d231725b2ed0828749d8a1e0fad73ff
- sha256sums = 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
- sha256sums = 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
- sha256sums = f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
+ sha256sums = e2bfb7363d1504387e33383416d09b4fc7a5753332eb09890872d3456d5ba3d8
+ sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
+ sha256sums = 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
+ sha256sums = 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17
sha256sums = 5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
- sha256sums = dca6461fb6c78a662766d54580737e643b4b6dc43c26a197a8e9d7cb58872de2
+ sha256sums = ae4b7d082fac39895c18c2e55a1b0554f242689577473f4275908868598139cd
sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4
sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632
- sha256sums = 2a4adcd1ea1359fe401fde63384c553513ecc789a3ce1cf61c0d5ed7828edf9f
+ sha256sums = 8a376c0c7102753adf69ce3bdc189b306b7df8894181dd515299bd6930b6ed49
sha256sums = d36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb
sha256sums = 9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6
- sha256sums = 164d41e4499a9079ca7bf3b2feae8dbd3b8a599cc81164e8160462d47f762423
+ sha256sums = 45fd42cbf95d7d44059748f4af7c94191aff2723a04d249d85fcd60ef3e7dbc3
sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f
sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e
sha256sums = fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e
- sha256sums = fb8b9cc974849e074a9e8694d62c383ffee6470e17459178de23d215f16bc57a
- sha256sums = 056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95
+ sha256sums = 696127e85fffbfb520ed0f1d8fcc56097f7add88ffc42e70e110032f831ef06f
+ sha256sums = 9b6ada97fd80c4693e5cae77a0376b02cb3964395010f8220468d9b2cd98c475
sha256sums = b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3
- sha256sums = 2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d
- sha256sums = 3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d
- sha256sums = c525872f266457e2e8195781193fb59c302b6fb920ad7b1ed227b8f126395526
- sha256sums = e7013af51af0cb1e088f7fc25576471076780bc97e05e7921fe819a3c87fce8b
- sha256sums = bd61f5c2a9edcf899a1640d18ba0f858b4ecd800b6311e17e53838405a7b3748
+ sha256sums = 48da1407d85e11158e62e39f05b9b10498a40e8aec29206ef5b427bde6742b36
+ sha256sums = 743a744a1939040e779f3c660184bd29dde11998761ca9fd6cde6c0759a5d1d7
+ sha256sums = 4909165bef4458415598165a553d70499926ec49a86b79e49d237aceaf7f709b
sha256sums = 9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9
sha256sums = c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd
diff --git a/PKGBUILD b/PKGBUILD
index bed685dbee92..443c95653f13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,78 @@
# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
pkgname=devkitarm
-pkgver=r46
-_binutilsver=2.27
-_gccver=6.3.0
+pkgver=r47
+_buildscriptsver=20170715
+_binutilsver=2.28
+_gccver=7.1.0
_newlibver=2.5.0
-_gdbver=7.12
+_gdbver=8.0
_generaltoolsver=1.0.0
-_islver=0.16.1
+_islver=0.18
_gbatoolsver=1.0.0
-_gp32toolsver=1.0.2
+_gp32toolsver=1.0.3
_dstoolsver=1.1.0
_gritver=0.8.14
-_ndstoolver=2.0.1
+_ndstoolver=2.0.3
_dlditoolver=1.24.0
_mmutilver=1.8.6
_dfuutilver=0.9.1
-_stlinkver=1.2.1
-_3dslinkver=0.5.1
+_stlinkver=1.2.2
+_3dslinkver=0.5.2
_3dstoolsver=1.1.4
-_picassover=2.5.0
+_picassover=2.6.2
pkgrel=1
pkgdesc="ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development"
arch=('i686' 'x86_64')
url="http://devkitpro.org"
license=('GPL')
options=(!strip libtool staticlibs emptydirs)
-depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb' 'guile')
+depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb')
install=devkitarm.install
-source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20170126.tar.bz2"
+source=("https://github.com/devkitPro/buildscripts/releases/download/v$_buildscriptsver/buildscripts-$_buildscriptsver.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"
+ "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/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"
- "fix-gcc-6.3.0-compilation-on-gcc-7.patch"
- "fix-gdb-7.12-compilation-on-gcc-7.patch"
"devkitarm.sh"
"devkitarm.fish")
-sha256sums=('6b142f265bc9c7fc9449f5b539198f140d231725b2ed0828749d8a1e0fad73ff'
- '412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2'
- '369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88'
- 'f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f'
+sha256sums=('e2bfb7363d1504387e33383416d09b4fc7a5753332eb09890872d3456d5ba3d8'
+ '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+ '6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72'
+ '8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17'
'5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b'
- 'dca6461fb6c78a662766d54580737e643b4b6dc43c26a197a8e9d7cb58872de2'
+ 'ae4b7d082fac39895c18c2e55a1b0554f242689577473f4275908868598139cd'
'09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4'
'5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632'
- '2a4adcd1ea1359fe401fde63384c553513ecc789a3ce1cf61c0d5ed7828edf9f'
+ '8a376c0c7102753adf69ce3bdc189b306b7df8894181dd515299bd6930b6ed49'
'd36fce5cc8c8be0c6ba506517ca769ba8311b8a9310c525b20c80131b96251cb'
'9b60af9f8a462155213d50fe69b670587de60537f5fbb449a09db6418a3ffad6'
- '164d41e4499a9079ca7bf3b2feae8dbd3b8a599cc81164e8160462d47f762423'
+ '45fd42cbf95d7d44059748f4af7c94191aff2723a04d249d85fcd60ef3e7dbc3'
'5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f'
'5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e'
'fdcee458cc5ca482810852cfce7fecf2e671d3881c329cd63c6a9030ffa9426e'
- 'fb8b9cc974849e074a9e8694d62c383ffee6470e17459178de23d215f16bc57a'
- '056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95'
+ '696127e85fffbfb520ed0f1d8fcc56097f7add88ffc42e70e110032f831ef06f'
+ '9b6ada97fd80c4693e5cae77a0376b02cb3964395010f8220468d9b2cd98c475'
'b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3'
- '2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d'
- '3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d'
- 'c525872f266457e2e8195781193fb59c302b6fb920ad7b1ed227b8f126395526'
- 'e7013af51af0cb1e088f7fc25576471076780bc97e05e7921fe819a3c87fce8b'
- 'bd61f5c2a9edcf899a1640d18ba0f858b4ecd800b6311e17e53838405a7b3748'
+ '48da1407d85e11158e62e39f05b9b10498a40e8aec29206ef5b427bde6742b36'
+ '743a744a1939040e779f3c660184bd29dde11998761ca9fd6cde6c0759a5d1d7'
+ '4909165bef4458415598165a553d70499926ec49a86b79e49d237aceaf7f709b'
'9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9'
'c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd')
noextract=("binutils-$_binutilsver.tar.bz2" "gcc-$_gccver.tar.bz2"
@@ -113,16 +110,12 @@ END
buildscripts/build-devkit.sh
# use in-tree isl
- # add patch to build gcc 6.3.0 on gcc >7
# disable guile for gdb
patch -Np0 < devkitarm-add-patches.patch
- # isl needlessly wants automake-14, upgrading
+ # isl needlessly wants automake-15, upgrading
autoreconf -Wnone -fi isl-$_islver
- # 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
}
diff --git a/devkitarm-add-patches.patch b/devkitarm-add-patches.patch
index ba133c748171..8d77947d595d 100644
--- a/devkitarm-add-patches.patch
+++ b/devkitarm-add-patches.patch
@@ -1,22 +1,18 @@
diff -Naur buildscripts.orig/build-devkit.sh buildscripts/build-devkit.sh
---- buildscripts.orig/build-devkit.sh 2017-01-25 20:10:12.000000000 +0100
-+++ buildscripts/build-devkit.sh 2017-06-27 18:11:47.033227074 +0200
-@@ -232,8 +232,11 @@
+--- 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.16.1" gcc-$GCC_VER/isl
-+patch -Np0 < "$SRCDIR/fix-gcc-6.3.0-compilation-on-gcc-7.patch"
++cp -ru "$SRCDIR/isl-0.18" gcc-$GCC_VER/isl
extract_and_patch newlib $NEWLIB_VER gz
extract_and_patch gdb $GDB_VER bz2
-+patch -d gdb-$GDB_VER -Np1 < "$SRCDIR/fix-gdb-7.12-compilation-on-gcc-7.patch"
- if [ $VERSION -eq 2 ]; then
- extract_and_patch binutils $MN_BINUTILS_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-01-25 17:51:43.000000000 +0100
-+++ buildscripts/dkarm-eabi/scripts/build-gcc.sh 2017-06-27 17:51:30.771359311 +0200
-@@ -61,6 +61,7 @@
+--- 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 \
@@ -24,7 +20,7 @@ diff -Naur buildscripts.orig/dkarm-eabi/scripts/build-gcc.sh buildscripts/dkarm-
--with-newlib \
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
--prefix=$prefix \
-@@ -158,7 +159,7 @@
+@@ -154,7 +155,7 @@
CXXFLAGS="$cflags" \
LDFLAGS="$ldflags" \
../../gdb-$GDB_VER/configure \
diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch
index 795656682e77..5adf3213a2ef 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 2017-01-25 20:10:12.000000000 +0100
-+++ buildscripts/build-devkit.sh 2017-02-05 03:44:47.323301185 +0100
-@@ -218,7 +218,7 @@
+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"
@@ -10,7 +10,7 @@ diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
do
echo $archive
if [ ! -f $archive ]; then
-@@ -239,16 +239,6 @@
+@@ -251,16 +251,6 @@
extract_and_patch binutils $MN_BINUTILS_VER bz2
fi
@@ -27,9 +27,9 @@ diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh
for archive in $hostarchives
do
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
-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
+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
diff --git a/fix-gcc-6.3.0-compilation-on-gcc-7.patch b/fix-gcc-6.3.0-compilation-on-gcc-7.patch
deleted file mode 100644
index be91072010cc..000000000000
--- a/fix-gcc-6.3.0-compilation-on-gcc-7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
-From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 3 Sep 2016 10:57:05 +0000
-Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty
- string.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Upstream-Status: Backport
-Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-
----
- gcc/ubsan.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-6.3.0/gcc/ubsan.c
-===================================================================
---- gcc-6.3.0.orig/gcc/ubsan.c
-+++ gcc-6.3.0/gcc/ubsan.c
-@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
-
- expanded_location xloc = expand_location (loc);
- if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
-- || xloc.file == '\0' || xloc.file[0] == '\xff'
-+ || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
- || xloc.file[1] == '\xff')
- return false;
-
diff --git a/fix-gdb-7.12-compilation-on-gcc-7.patch b/fix-gdb-7.12-compilation-on-gcc-7.patch
deleted file mode 100644
index e21955d3fedd..000000000000
--- a/fix-gdb-7.12-compilation-on-gcc-7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 909de2c5cc91b815d671f7018da2a925fbd19aaf Mon Sep 17 00:00:00 2001
-From: Tom Tromey <tom@tromey.com>
-Date: Mon, 24 Oct 2016 12:06:39 +0100
-Subject: [PATCH] PR gdb/20653 - small cleanup in string_to_explicit_location
-
-This bug points out that string_to_explicit_location compares a char*
-against '\0'; whereas comparing against NULL is more normal.
-
-2016-10-24 Tom Tromey <tom@tromey.com>
-
- PR breakpoints/20653:
- * location.c (string_to_explicit_location): Use NULL, not '\0'.
----
- gdb/location.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/location.c b/gdb/location.c
-index 65116c7..8dce21a 100644
---- a/gdb/location.c
-+++ b/gdb/location.c
-@@ -524,7 +524,7 @@ string_to_explicit_location (const char **argp,
- character is an explicit location. "-p" is reserved, though,
- for probe locations. */
- if (argp == NULL
-- || *argp == '\0'
-+ || *argp == NULL
- || *argp[0] != '-'
- || !isalpha ((*argp)[1])
- || ((*argp)[0] == '-' && (*argp)[1] == 'p'))
---
-2.9.3
-