diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 00000000..45497445 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,65 @@ +pkgbase = devkitarm + pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development + pkgver = r42 + 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 = newlib-2.1.0.tar.gz + noextract = gdb-7.7.tar.bz2 + noextract = gbatools-1.0.0.tar.bz2 + noextract = dstools-1.0.0.tar.bz2 + noextract = grit-0.8.12.tar.bz2 + noextract = ndstool-1.50.1.tar.bz2 + 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 + options = !strip + options = libtool + options = staticlibs + 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 + 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/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 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.1.tar.bz2 + 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 = devkitarm.sh + sha256sums = f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec + sha256sums = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 + sha256sums = 09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8 + sha256sums = 3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48 + sha256sums = 0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23 + sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632 + sha256sums = 478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220 + sha256sums = 6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929 + sha256sums = bfdc13d3b9917886da239b7e3cb2c7c3bc063475252f16a2d761f943ae289169 + sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4 + sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f + sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e + sha256sums = 33a1922cf7fb57c3d80e873dc20cabd550d1285476ab5a0efa4d910aceafd2f0 + sha256sums = 8ac33627490158ba32c4b18bd8ceba1ac083658c6005c3cbae077045af9f1033 + sha256sums = a6f33eaf2d89493f5bb557ef82c6286793c7e69dd3f6de6be85733835b193bd7 + +pkgname = devkitarm + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 00000000..95c84360 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,90 @@ +# Maintainer: carstene1ns +# Contributor: Schnouki +# Contributor: Vithon +# Contributor: Aaron +# Contributor: TheGuy + +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/" +license=('GPL') +options=(!strip libtool staticlibs) +depends=('xz' 'freeimage' 'python' 'cloog' 'flex' 'libmpc' 'libusb') +install=devkitarm.install +source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20140402.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/newlib-2.1.0.tar.gz" + "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.7.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" + "http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.1.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.7.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/stlink-0.5.7.tar.bz2" + "devkitarm.sh") +sha256sums=('f272442812d44ae22bae8597c9325cb0035a901c59b4a62140dbedc7c31cbaec' + 'e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137' + '09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8' + '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48' + '0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23' + '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632' + '478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220' + '6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929' + 'bfdc13d3b9917886da239b7e3cb2c7c3bc063475252f16a2d761f943ae289169' + '09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4' + '5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f' + '5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e' + '33a1922cf7fb57c3d80e873dc20cabd550d1285476ab5a0efa4d910aceafd2f0' + '8ac33627490158ba32c4b18bd8ceba1ac083658c6005c3cbae077045af9f1033' + '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' + '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') + +prepare() { + # reset build dir + rm -rf build + + # generate config file for automatic build + cat << END > buildscripts/config.sh +#!bin/sh +BUILD_DKPRO_PACKAGE=1 +BUILD_DKPRO_DOWNLOAD=2 +BUILD_DKPRO_INSTALLDIR=$PWD/build +BUILD_DKPRO_SRCDIR=$PWD +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 + + # 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 +} + +build() { + cd buildscripts + + # disable conflicting build flags + unset CPPFLAGS + ./build-devkit.sh +} + +package() { + install -d "$pkgdir"/opt/devkitpro + cp -r build/devkitARM "$pkgdir"/opt/devkitpro + # export environment variables + install -Dm755 devkitarm.sh "$pkgdir"/etc/profile.d/devkitarm.sh +} diff --git a/devkitarm.install b/devkitarm.install new file mode 100644 index 00000000..51f2ee3f --- /dev/null +++ b/devkitarm.install @@ -0,0 +1,10 @@ + +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." +} + +post_upgrade() { + post_install +} diff --git a/devkitarm.sh b/devkitarm.sh new file mode 100644 index 00000000..04f5e843 --- /dev/null +++ b/devkitarm.sh @@ -0,0 +1,10 @@ + +# allow per-user 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 -- 2.51.2 From 63c85986897b419f9907d34efa37e8632fab00aa Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Tue, 19 Aug 2014 02:55:57 +0200 Subject: [PATCH 02/14] [fix] Change search path to use provided tools instead of the already installed ones for (re-)builds --- .SRCINFO | 5 ++- PKGBUILD | 19 +++++------ devkitarm-skip-libs.patch | 66 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 devkitarm-skip-libs.patch diff --git a/.SRCINFO b/.SRCINFO index 45497445..a912991a 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 95c84360..a570a4f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,17 +1,13 @@ -# Maintainer: carstene1ns -# Contributor: Schnouki -# Contributor: Vithon -# Contributor: Aaron -# Contributor: TheGuy +# Maintainer: carstene1ns - 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 00000000..fdabcab0 --- /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; } -- 2.51.2 From 1e65637ad8c8daf679caf811b270cf2e1740f36c Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 23 Nov 2014 16:56:48 +0100 Subject: [PATCH 03/14] =?UTF-8?q?[upd]=20r42=E2=86=92r43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 39 +++++++++++++++++++------------------- PKGBUILD | 40 ++++++++++++++++++++------------------- devkitarm-skip-libs.patch | 22 +++++++++++++-------- devkitarm.sh | 2 +- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a912991a..45e24877 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 a570a4f4..0142b82c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,20 +1,20 @@ # Maintainer: carstene1ns - 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 fdabcab0..c4e65428 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 04f5e843..a2110702 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 -- 2.51.2 From 239d3070eeb6e2ec2e7f0aee6d1cb6ad5537f230 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 22 Feb 2015 23:48:18 +0100 Subject: [PATCH 04/14] =?UTF-8?q?[upd]=20r43=E2=86=92r44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 57 ++++++++++++++++++++++----------------- PKGBUILD | 54 ++++++++++++++++++++----------------- devkitarm-skip-libs.patch | 21 ++++++++------- 3 files changed, 72 insertions(+), 60 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45e24877..3be57188 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = devkitarm pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development - pkgver = r43 + pkgver = r44 pkgrel = 1 url = http://www.devkitpro.org install = devkitarm.install @@ -12,57 +12,64 @@ pkgbase = devkitarm depends = flex depends = libmpc depends = libusb - noextract = binutils-2.24.tar.bz2 + depends = guile + noextract = binutils-2.25.tar.bz2 noextract = gcc-4.9.2.tar.bz2 - noextract = newlib-2.1.0.tar.gz - noextract = gdb-7.7.1.tar.bz2 + noextract = newlib-2.2.0.tar.gz + noextract = gdb-7.8.2.tar.bz2 noextract = gbatools-1.0.0.tar.bz2 - noextract = dstools-1.0.0.tar.bz2 + noextract = gp32tools-1.0.1.tar.bz2 + noextract = dstools-1.0.2.tar.bz2 noextract = grit-0.8.12.tar.bz2 - noextract = ndstool-1.50.1.tar.bz2 + noextract = ndstool-1.50.3.tar.bz2 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.1.tar.bz2 + noextract = dfu-util-0.8.1.tar.bz2 noextract = stlink-0.5.8.tar.bz2 - noextract = 3dstools-1.0.0.tar.bz2 + noextract = 3dstools-1.0.3.tar.bz2 + noextract = 3dslink-0.5.0.tar.bz2 options = !strip options = libtool options = staticlibs options = emptydirs - 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/buildscripts-20150216.tar.bz2 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.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.1.tar.bz2 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.2.0.tar.gz + source = http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.8.2.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/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.12.tar.bz2 - source = http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.1.tar.bz2 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.3.tar.bz2 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.1.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/3dstools-1.0.0.tar.bz2 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.0.3.tar.bz2 + source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.0.tar.bz2 source = devkitarm-skip-libs.patch source = devkitarm.sh - sha256sums = de5e8443693c7fee99f2b06ef6011bb208ee123f66c80fdf2bc39929af468a6c - sha256sums = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 + sha256sums = d1516ffb657ceaea7f0b0279adeed9b02489904cf0e922f8e42a20efdc2e0733 + sha256sums = 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 sha256sums = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd - sha256sums = 3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48 - sha256sums = 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5 + sha256sums = f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be + sha256sums = 20e15ee7dab713fee26eccc29e02eccc744d9e13d875cc136a473b6a94aaab58 sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632 - sha256sums = 478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220 + sha256sums = 6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413 + sha256sums = 96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2 sha256sums = 6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929 - sha256sums = bfdc13d3b9917886da239b7e3cb2c7c3bc063475252f16a2d761f943ae289169 + sha256sums = 674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862 sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4 sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e - sha256sums = c406878c2bdf5b592b84a125a6184148bd9bf92da014fceaf1e6674449302388 + sha256sums = 2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1 sha256sums = f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9 - sha256sums = 74ebc28c7e8ab369efb36afa711dd801fc850387322e935123d1c92d890a270e - sha256sums = 2ffb027cc26d60db4f75ac4888f5fb8a949ea6966235d448c1ffe17261be26b8 + sha256sums = 106d38f6d55e3190a133150bd8a5e1eb4f89b181f5c634bb060e69fe489b94f0 + sha256sums = 66eb27c09406dcc59fa129ba7c01ac80059c1102622f70175f65492cb7442052 + sha256sums = 169d9f31f4ef24309f2a752daf2506762077b09849c983116e71fbc8710be814 sha256sums = fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db pkgname = devkitarm diff --git a/PKGBUILD b/PKGBUILD index 0142b82c..7db57896 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,54 +1,59 @@ # Maintainer: carstene1ns - http://git.io/ctPKG pkgname=devkitarm -pkgver=r43 +pkgver=r44 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=('freeimage' 'python' 'flex' 'libmpc' 'libusb') +depends=('freeimage' 'python' 'flex' 'libmpc' 'libusb' 'guile') install=devkitarm.install -source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20141121.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.24.tar.bz2" +source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20150216.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.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.1.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/newlib-2.2.0.tar.gz" + "http://downloads.sourceforge.net/sourceforge/devkitpro/gdb-7.8.2.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/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.12.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/devkitpro/ndstool-1.50.1.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.7.1.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/3dstools-1.0.0.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.0.3.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.0.tar.bz2" "devkitarm-skip-libs.patch" "devkitarm.sh") -sha256sums=('de5e8443693c7fee99f2b06ef6011bb208ee123f66c80fdf2bc39929af468a6c' - 'e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137' +sha256sums=('d1516ffb657ceaea7f0b0279adeed9b02489904cf0e922f8e42a20efdc2e0733' + '22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923' '2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd' - '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48' - '0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5' + 'f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be' + '20e15ee7dab713fee26eccc29e02eccc744d9e13d875cc136a473b6a94aaab58' '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632' - '478ebf21f5b63fda920118370f14bf4057c93617e281a2f2901f6405f9d58220' + '6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413' + '96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2' '6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929' - 'bfdc13d3b9917886da239b7e3cb2c7c3bc063475252f16a2d761f943ae289169' + '674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862' '09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4' '5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f' '5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e' - 'c406878c2bdf5b592b84a125a6184148bd9bf92da014fceaf1e6674449302388' + '2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1' 'f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9' - '74ebc28c7e8ab369efb36afa711dd801fc850387322e935123d1c92d890a270e' - '2ffb027cc26d60db4f75ac4888f5fb8a949ea6966235d448c1ffe17261be26b8' + '106d38f6d55e3190a133150bd8a5e1eb4f89b181f5c634bb060e69fe489b94f0' + '66eb27c09406dcc59fa129ba7c01ac80059c1102622f70175f65492cb7442052' + '169d9f31f4ef24309f2a752daf2506762077b09849c983116e71fbc8710be814' '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.1.tar.bz2' - 'stlink-0.5.8.tar.bz2' '3dstools-1.0.0.tar.bz2') +noextract=('binutils-2.25.tar.bz2' 'gcc-4.9.2.tar.bz2' 'newlib-2.2.0.tar.gz' + 'gdb-7.8.2.tar.bz2' 'gbatools-1.0.0.tar.bz2' 'gp32tools-1.0.1.tar.bz2' + 'dstools-1.0.2.tar.bz2' 'grit-0.8.12.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' '3dstools-1.0.3.tar.bz2' + '3dslink-0.5.0.tar.bz2') prepare() { # reset build dir @@ -58,7 +63,6 @@ prepare() { cat << END > buildscripts/config.sh #!bin/sh BUILD_DKPRO_PACKAGE=1 -BUILD_DKPRO_DOWNLOAD=2 BUILD_DKPRO_INSTALLDIR=$PWD/build BUILD_DKPRO_SRCDIR=$PWD BUILD_DKPRO_AUTOMATED=1 diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch index c4e65428..3f7ca319 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-11-21 18:55:02.000000000 +0100 -+++ buildscripts/build-devkit.sh 2014-11-23 13:31:04.702390386 +0100 -@@ -220,7 +220,7 @@ +diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh +--- buildscripts/build-devkit.sh 2015-02-16 01:53:37.000000000 +0100 ++++ buildscripts.no-libs/build-devkit.sh 2015-02-22 11:19:40.545502408 +0100 +@@ -226,7 +226,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 -@@ -238,15 +238,6 @@ +@@ -244,16 +244,6 @@ extract_and_patch newlib $NEWLIB_VER gz extract_and_patch gdb $GDB_VER bz2 @@ -23,16 +23,17 @@ diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh - 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 2014-11-21 10:44:39.000000000 +0100 -+++ buildscripts/dkarm-eabi/scripts/build-crtls.sh 2014-11-23 13:35:57.892675791 +0100 + 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-02-22 11:21:07.943233856 +0100 @@ -22,40 +22,3 @@ $MAKE CRT=ds_arm9 $MAKE CRT=ds_cart - $MAKE CRT=3dsx + $target-gcc -march=armv6k -mfloat-abi=hard -c 3dsx_crt0.s -o armv6k/fpu/3dsx_crt0.o - -cd $BUILDDIR/libgba-$LIBGBA_VER -$MAKE || { echo "error building libgba"; exit 1; } -- 2.51.2 From c22281880aa42d89d8f2b0755bf3de31aa30604c Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 13 Dec 2015 16:06:29 +0100 Subject: [PATCH 05/14] =?UTF-8?q?[upd]=20r44=E2=86=92r45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 47 +++++++++++++++++++++------------------ PKGBUILD | 44 +++++++++++++++++++----------------- devkitarm-skip-libs.patch | 10 ++++----- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3be57188..3960f114 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = devkitarm pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development - pkgver = r44 + pkgver = r45 pkgrel = 1 url = http://www.devkitpro.org install = devkitarm.install @@ -13,63 +13,66 @@ pkgbase = devkitarm depends = libmpc depends = libusb depends = guile - noextract = binutils-2.25.tar.bz2 - noextract = gcc-4.9.2.tar.bz2 + noextract = binutils-2.25.1.tar.bz2 + noextract = gcc-5.3.0.tar.bz2 noextract = newlib-2.2.0.tar.gz - noextract = gdb-7.8.2.tar.bz2 + 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.12.tar.bz2 + noextract = grit-0.8.13.tar.bz2 noextract = ndstool-1.50.3.tar.bz2 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.8.1.tar.bz2 noextract = stlink-0.5.8.tar.bz2 - noextract = 3dstools-1.0.3.tar.bz2 - noextract = 3dslink-0.5.0.tar.bz2 + noextract = 3dslink-0.5.1.tar.bz2 + noextract = 3dstools-1.1.1.tar.bz2 + noextract = picasso-2.1.0.tar.bz2 options = !strip options = libtool options = staticlibs options = emptydirs - source = http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20150216.tar.bz2 - source = http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.tar.bz2 - source = http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.9.2.tar.bz2 + 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://mirrors.kernel.org/gnu/gcc/gcc-5.3.0/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.8.2.tar.bz2 + 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.12.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/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.8.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.3.tar.bz2 - source = http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.0.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 = devkitarm-skip-libs.patch source = devkitarm.sh - sha256sums = d1516ffb657ceaea7f0b0279adeed9b02489904cf0e922f8e42a20efdc2e0733 - sha256sums = 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 - sha256sums = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd + sha256sums = dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818 + sha256sums = b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 + sha256sums = b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db sha256sums = f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be - sha256sums = 20e15ee7dab713fee26eccc29e02eccc744d9e13d875cc136a473b6a94aaab58 + sha256sums = 06e9f1a56a993f759e63563cd293fd222a8c8e89b70074f1800f5e1976f93a40 sha256sums = 5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632 sha256sums = 6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413 sha256sums = 96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2 - sha256sums = 6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929 + sha256sums = 052d52082e9aed9c9e7e60870dcc024d5473e437a73fb5ef0329acf794f8a4e8 sha256sums = 674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862 sha256sums = 09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4 sha256sums = 5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f sha256sums = 5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e sha256sums = 2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1 sha256sums = f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9 - sha256sums = 106d38f6d55e3190a133150bd8a5e1eb4f89b181f5c634bb060e69fe489b94f0 - sha256sums = 66eb27c09406dcc59fa129ba7c01ac80059c1102622f70175f65492cb7442052 - sha256sums = 169d9f31f4ef24309f2a752daf2506762077b09849c983116e71fbc8710be814 + sha256sums = 056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95 + sha256sums = 6dbf15bb5cbeee826b6ffc608288f1267ed3696d725956943545c0572401d548 + sha256sums = 79bf84b42da964918f6c8bb1294434ed1e10feab9a2b1f5a0183030637977650 + sha256sums = 97b498aa26aba743e141115cd8f1169aa8411532f589c3c845233a299f5ecf74 sha256sums = fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db pkgname = devkitarm diff --git a/PKGBUILD b/PKGBUILD index 7db57896..b3a66aee 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: carstene1ns - http://git.io/ctPKG pkgname=devkitarm -pkgver=r44 +pkgver=r45 pkgrel=1 pkgdesc="An ARM toolchain for GP32, Nintendo DS and GBA homebrew development" arch=('i686' 'x86_64') @@ -10,50 +10,52 @@ 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-20150216.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/devkitpro/gcc-4.9.2.tar.bz2" +source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-20151213.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/devkitpro/binutils-2.25.1.tar.bz2" + "http://mirrors.kernel.org/gnu/gcc/gcc-5.3.0/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.8.2.tar.bz2" + "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.12.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/3dstools-1.0.3.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/devkitpro/3dslink-0.5.0.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" "devkitarm-skip-libs.patch" "devkitarm.sh") -sha256sums=('d1516ffb657ceaea7f0b0279adeed9b02489904cf0e922f8e42a20efdc2e0733' - '22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923' - '2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd' +sha256sums=('dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818' + 'b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22' + 'b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db' 'f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be' - '20e15ee7dab713fee26eccc29e02eccc744d9e13d875cc136a473b6a94aaab58' + '06e9f1a56a993f759e63563cd293fd222a8c8e89b70074f1800f5e1976f93a40' '5e39c58f610410f19312d3fd4380418929912d2173dfa79fb7fe36a192988632' '6724bed8e8767956d571b0f334652bdfe07e52ab3dafe2a8292a1d6c4134f413' '96af20e6a352e741e8127579a6d64d10ff6d829dc757dfb157f7fb60c6d1abd2' - '6fedae3c9737a8aa81a898aff52f775ee199befa4eea238adea5029f85f73929' + '052d52082e9aed9c9e7e60870dcc024d5473e437a73fb5ef0329acf794f8a4e8' '674984065e3ab5f0321c024a5c88808c4f3651a9e054ddcb408121d93fcab862' '09474dfc1537e1008ee95b1a39a53715b8a740ee5ee37f4376607d6b110343c4' '5ecf67bcd5e2088ad31cd27fa14db575001388abc19510c4297aae42e9cd5d2f' '5b9182accb99abc03c1a31c39c003fbc5cb0d4af65a44102ede6098828cd045e' '2b56d91b86743f2ff09d818e0f2bd6704f154db5703b49c36b0a6d7da4e381e1' 'f528cdaf328b74e1814e88f0fcbe04f4ee221d45c740dc1456de4e4036047bb9' - '106d38f6d55e3190a133150bd8a5e1eb4f89b181f5c634bb060e69fe489b94f0' - '66eb27c09406dcc59fa129ba7c01ac80059c1102622f70175f65492cb7442052' - '169d9f31f4ef24309f2a752daf2506762077b09849c983116e71fbc8710be814' + '056bed0a85ad4d044f60a13752d721769fe0631cda0cc6d6831bf30e808f8e95' + '6dbf15bb5cbeee826b6ffc608288f1267ed3696d725956943545c0572401d548' + '79bf84b42da964918f6c8bb1294434ed1e10feab9a2b1f5a0183030637977650' + '97b498aa26aba743e141115cd8f1169aa8411532f589c3c845233a299f5ecf74' 'fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db') -noextract=('binutils-2.25.tar.bz2' 'gcc-4.9.2.tar.bz2' 'newlib-2.2.0.tar.gz' - 'gdb-7.8.2.tar.bz2' 'gbatools-1.0.0.tar.bz2' 'gp32tools-1.0.1.tar.bz2' - 'dstools-1.0.2.tar.bz2' 'grit-0.8.12.tar.bz2' 'ndstool-1.50.3.tar.bz2' +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' '3dstools-1.0.3.tar.bz2' - '3dslink-0.5.0.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') prepare() { # reset build dir diff --git a/devkitarm-skip-libs.patch b/devkitarm-skip-libs.patch index 3f7ca319..e012f237 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-02-16 01:53:37.000000000 +0100 -+++ buildscripts.no-libs/build-devkit.sh 2015-02-22 11:19:40.545502408 +0100 -@@ -226,7 +226,7 @@ +--- 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 @@ fi cd "$SRCDIR" @@ -10,7 +10,7 @@ diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh do echo $archive if [ ! -f $archive ]; then -@@ -244,16 +244,6 @@ +@@ -246,16 +246,6 @@ extract_and_patch newlib $NEWLIB_VER gz extract_and_patch gdb $GDB_VER bz2 @@ -29,7 +29,7 @@ diff -Naur buildscripts/build-devkit.sh buildscripts.no-libs/build-devkit.sh 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-02-22 11:21:07.943233856 +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 -- 2.51.2 From fd50f354c5dcda3866eb30b7654db93830b0e8ce Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 27 Nov 2016 23:56:48 +0100 Subject: [PATCH 06/14] [fix] build on GCC 6 --- .SRCINFO | 14 +- PKGBUILD | 20 ++- devkitarm-add-gcc-patch.patch | 11 ++ devkitarm-add-tool-patches.patch | 13 ++ fix-gcc-5.3.0-compilation-on-gcc-6.patch | 163 +++++++++++++++++++++++ fix-gp32tools.patch | 42 ++++++ fix-grit.patch | 40 ++++++ 7 files changed, 299 insertions(+), 4 deletions(-) create mode 100644 devkitarm-add-gcc-patch.patch create mode 100644 devkitarm-add-tool-patches.patch create mode 100644 fix-gcc-5.3.0-compilation-on-gcc-6.patch create mode 100644 fix-gp32tools.patch create mode 100644 fix-grit.patch diff --git a/.SRCINFO b/.SRCINFO index 3960f114..03966557 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = devkitarm pkgdesc = An ARM toolchain for GP32, Nintendo DS and GBA homebrew development pkgver = r45 - pkgrel = 1 + pkgrel = 2 url = http://www.devkitpro.org install = devkitarm.install arch = i686 @@ -36,7 +36,7 @@ pkgbase = devkitarm 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://mirrors.kernel.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.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 @@ -53,6 +53,11 @@ pkgbase = devkitarm 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 = 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.sh sha256sums = dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818 sha256sums = b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 @@ -73,6 +78,11 @@ pkgbase = devkitarm sha256sums = 6dbf15bb5cbeee826b6ffc608288f1267ed3696d725956943545c0572401d548 sha256sums = 79bf84b42da964918f6c8bb1294434ed1e10feab9a2b1f5a0183030637977650 sha256sums = 97b498aa26aba743e141115cd8f1169aa8411532f589c3c845233a299f5ecf74 + sha256sums = 6462b0911186b1b0167c74e2b146d7c09b17974c021ce37087e8c157b6cdd59f + sha256sums = 27353ac1375867b8d07889a35515e144f3f989588fec4364adc6c5317d17ae4f + sha256sums = e22c5cb2748a8a62eacbd9401fcdd7a1239a469ab7811382e7564e7554ce2341 + sha256sums = e8fd36de318e8a2726c24d7de0190e475da628456380032a708e0ab232d5e091 + sha256sums = fce6e900ee23ebe0bdee1e6f58e02ba521598f5a1a74eb5798ee35ca1f27be3b sha256sums = fc5489fab5ee4ce5cd53c2e1549fd2958872a6777324920b89e03b88584072db pkgname = devkitarm diff --git a/PKGBUILD b/PKGBUILD index b3a66aee..dd9e618b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=devkitarm pkgver=r45 -pkgrel=1 +pkgrel=2 pkgdesc="An ARM toolchain for GP32, Nintendo DS and GBA homebrew development" arch=('i686' 'x86_64') url="http://www.devkitpro.org" @@ -12,7 +12,7 @@ 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://mirrors.kernel.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.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" @@ -29,6 +29,11 @@ source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-201 "http://downloads.sourceforge.net/sourceforge/devkitpro/3dstools-1.1.1.tar.bz2" "http://downloads.sourceforge.net/sourceforge/devkitpro/picasso-2.1.0.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' @@ -49,6 +54,11 @@ sha256sums=('dffe312bdcd86b30bbe91969fb82c8634b6e7171548c04ee8ebf52540de28818' '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' @@ -79,6 +89,12 @@ 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 + + # add patch to build tools on gcc >6 + patch -Np0 < devkitarm-add-tool-patches.patch + # disable building of libraries, we have separate packages patch -Np0 < devkitarm-skip-libs.patch } diff --git a/devkitarm-add-gcc-patch.patch b/devkitarm-add-gcc-patch.patch new file mode 100644 index 00000000..a993c74f --- /dev/null +++ b/devkitarm-add-gcc-patch.patch @@ -0,0 +1,11 @@ +diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh +--- buildscripts.old/build-devkit.sh 2016-11-27 21:58:40.103228901 +0100 ++++ buildscripts/build-devkit.sh 2016-11-27 22:54:55.283172632 +0100 +@@ -243,6 +243,7 @@ + extract_and_patch binutils $BINUTILS_VER bz2 + extract_and_patch gcc $GCC_VER bz2 + rm -fr gcc-$GCC_VER/zlib ++patch -d gcc-$GCC_VER -Np1 < "$SRCDIR/fix-gcc-5.3.0-compilation-on-gcc-6.patch" + extract_and_patch newlib $NEWLIB_VER gz + extract_and_patch gdb $GDB_VER bz2 + diff --git a/devkitarm-add-tool-patches.patch b/devkitarm-add-tool-patches.patch new file mode 100644 index 00000000..27167d47 --- /dev/null +++ b/devkitarm-add-tool-patches.patch @@ -0,0 +1,13 @@ +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/fix-gcc-5.3.0-compilation-on-gcc-6.patch b/fix-gcc-5.3.0-compilation-on-gcc-6.patch new file mode 100644 index 00000000..7be4ecd2 --- /dev/null +++ b/fix-gcc-5.3.0-compilation-on-gcc-6.patch @@ -0,0 +1,163 @@ +From 0adb418f0df38077add871fd62ce8cddda76d8de Mon Sep 17 00:00:00 2001 +From: Carsten Teibes +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 ++ Bernd Edlinger ++ ++ * 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 + . */ +-#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 ." + #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 + . */ +-#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 new file mode 100644 index 00000000..79efe85f --- /dev/null +++ b/fix-gp32tools.patch @@ -0,0 +1,42 @@ +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(b)->count - +- reinterpret_cast(a)->count; ++ return reinterpret_cast(b)->count - ++ reinterpret_cast(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(b)->count - +- reinterpret_cast(a)->count; ++ return reinterpret_cast(b)->count - ++ reinterpret_cast(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(b)->count - +- reinterpret_cast(a)->count; ++ return reinterpret_cast(b)->count - ++ reinterpret_cast(a)->count; + } + }; + diff --git a/fix-grit.patch b/fix-grit.patch new file mode 100644 index 00000000..186091ee --- /dev/null +++ b/fix-grit.patch @@ -0,0 +1,40 @@ +From cd792af5f92da6dfa00b0ed32126e6ccd17619b1 Mon Sep 17 00:00:00 2001 +From: Dave Murphy +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); + -- 2.51.2 From dea1bbe035d5ab0288a6a0389e4334c4f3b0c80a Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 5 Feb 2017 16:51:57 +0100 Subject: [PATCH 07/14] =?UTF-8?q?[upd]=20r45=E2=86=92r46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 110 ++++++++------- PKGBUILD | 145 +++++++++++--------- devkitarm-add-tool-patches.patch | 13 -- devkitarm-skip-libs.patch | 39 +++--- devkitarm-use-in-tree-isl.patch | 22 +++ devkitarm.fish | 6 + devkitarm.install | 9 +- devkitarm.sh | 14 +- fix-gcc-5.3.0-compilation-on-gcc-6.patch | 163 ----------------------- fix-gp32tools.patch | 42 ------ fix-grit.patch | 40 ------ 11 files changed, 198 insertions(+), 405 deletions(-) delete mode 100644 devkitarm-add-tool-patches.patch create mode 100644 devkitarm-use-in-tree-isl.patch create mode 100644 devkitarm.fish delete mode 100644 fix-gcc-5.3.0-compilation-on-gcc-6.patch delete mode 100644 fix-gp32tools.patch delete mode 100644 fix-grit.patch diff --git a/.SRCINFO b/.SRCINFO index 03966557..8daf6f60 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 dd9e618b..62f74afc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,75 +1,94 @@ # Maintainer: carstene1ns - 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 27167d47..00000000 --- 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 e012f237..79565668 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 00000000..f9e30684 --- /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 00000000..c028a13d --- /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 51f2ee3f..670fc5c0 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 a2110702..c97d0758 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 7be4ecd2..00000000 --- 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 -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 -+ Bernd Edlinger -+ -+ * 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 - . */ --#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 ." - #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 - . */ --#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 79efe85f..00000000 --- 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(b)->count - -- reinterpret_cast(a)->count; -+ return reinterpret_cast(b)->count - -+ reinterpret_cast(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(b)->count - -- reinterpret_cast(a)->count; -+ return reinterpret_cast(b)->count - -+ reinterpret_cast(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(b)->count - -- reinterpret_cast(a)->count; -+ return reinterpret_cast(b)->count - -+ reinterpret_cast(a)->count; - } - }; - diff --git a/fix-grit.patch b/fix-grit.patch deleted file mode 100644 index 186091ee..00000000 --- a/fix-grit.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cd792af5f92da6dfa00b0ed32126e6ccd17619b1 Mon Sep 17 00:00:00 2001 -From: Dave Murphy -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); - -- 2.51.2 From 635fc20f0822a4b39325db9cb788ac02c737631e Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Tue, 27 Jun 2017 18:36:49 +0200 Subject: [PATCH 08/14] [fix] Add patches to build with GCC7 Disable Guile for GDB (does not build) Fix ISL usage --- .SRCINFO | 8 ++++-- PKGBUILD | 13 +++++++-- devkitarm-add-gcc-patch.patch | 11 -------- devkitarm-add-patches.patch | 35 ++++++++++++++++++++++++ devkitarm-use-in-tree-isl.patch | 22 --------------- fix-gcc-6.3.0-compilation-on-gcc-7.patch | 28 +++++++++++++++++++ fix-gdb-7.12-compilation-on-gcc-7.patch | 32 ++++++++++++++++++++++ 7 files changed, 111 insertions(+), 38 deletions(-) delete mode 100644 devkitarm-add-gcc-patch.patch create mode 100644 devkitarm-add-patches.patch delete mode 100644 devkitarm-use-in-tree-isl.patch create mode 100644 fix-gcc-6.3.0-compilation-on-gcc-7.patch create mode 100644 fix-gdb-7.12-compilation-on-gcc-7.patch diff --git a/.SRCINFO b/.SRCINFO index 8daf6f60..ee322a11 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -54,7 +54,9 @@ pkgbase = devkitarm 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-use-in-tree-isl.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 @@ -77,7 +79,9 @@ pkgbase = devkitarm sha256sums = b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3 sha256sums = 2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d sha256sums = 3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d - sha256sums = df823a3344aa91ce8f2fa706c9918f95a99e71e0c65f0d281c8e59cef858280a + sha256sums = c525872f266457e2e8195781193fb59c302b6fb920ad7b1ed227b8f126395526 + sha256sums = e7013af51af0cb1e088f7fc25576471076780bc97e05e7921fe819a3c87fce8b + sha256sums = bd61f5c2a9edcf899a1640d18ba0f858b4ecd800b6311e17e53838405a7b3748 sha256sums = 9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9 sha256sums = c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd diff --git a/PKGBUILD b/PKGBUILD index 62f74afc..bed685db 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -48,7 +48,9 @@ source=("http://downloads.sourceforge.net/sourceforge/devkitpro/buildscripts-201 "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-use-in-tree-isl.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' @@ -71,7 +73,9 @@ sha256sums=('6b142f265bc9c7fc9449f5b539198f140d231725b2ed0828749d8a1e0fad73ff' 'b54002b86e3a6005a204153d7567876f920a1a5c0a2bc288d95d98189ef0f5e3' '2af6d351b8b1d3c107ab31463eca8e73f88f201e580c448bfc71876f4ebe314d' '3ba88e36a690f45baf642afbb49bd40e7fc7fb53e3f2eb69b594057cd6071e6d' - 'df823a3344aa91ce8f2fa706c9918f95a99e71e0c65f0d281c8e59cef858280a' + 'c525872f266457e2e8195781193fb59c302b6fb920ad7b1ed227b8f126395526' + 'e7013af51af0cb1e088f7fc25576471076780bc97e05e7921fe819a3c87fce8b' + 'bd61f5c2a9edcf899a1640d18ba0f858b4ecd800b6311e17e53838405a7b3748' '9448465b2de6b6aefc5e0a8404f780f737cb86b4b1280d653712271b892908f9' 'c4cc42b085be7c48f06f75c934e846a61749d9ba5e31ee463a03ba27a01c8afd') noextract=("binutils-$_binutilsver.tar.bz2" "gcc-$_gccver.tar.bz2" @@ -109,7 +113,10 @@ END buildscripts/build-devkit.sh # use in-tree isl - patch -Np0 < devkitarm-use-in-tree-isl.patch + # 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 autoreconf -Wnone -fi isl-$_islver diff --git a/devkitarm-add-gcc-patch.patch b/devkitarm-add-gcc-patch.patch deleted file mode 100644 index a993c74f..00000000 --- a/devkitarm-add-gcc-patch.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur buildscripts.old/build-devkit.sh buildscripts/build-devkit.sh ---- buildscripts.old/build-devkit.sh 2016-11-27 21:58:40.103228901 +0100 -+++ buildscripts/build-devkit.sh 2016-11-27 22:54:55.283172632 +0100 -@@ -243,6 +243,7 @@ - extract_and_patch binutils $BINUTILS_VER bz2 - extract_and_patch gcc $GCC_VER bz2 - rm -fr gcc-$GCC_VER/zlib -+patch -d gcc-$GCC_VER -Np1 < "$SRCDIR/fix-gcc-5.3.0-compilation-on-gcc-6.patch" - extract_and_patch newlib $NEWLIB_VER gz - extract_and_patch gdb $GDB_VER bz2 - diff --git a/devkitarm-add-patches.patch b/devkitarm-add-patches.patch new file mode 100644 index 00000000..ba133c74 --- /dev/null +++ b/devkitarm-add-patches.patch @@ -0,0 +1,35 @@ +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 @@ + + 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" + 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 @@ + --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 \ +@@ -158,7 +159,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-use-in-tree-isl.patch b/devkitarm-use-in-tree-isl.patch deleted file mode 100644 index f9e30684..00000000 --- a/devkitarm-use-in-tree-isl.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/fix-gcc-6.3.0-compilation-on-gcc-7.patch b/fix-gcc-6.3.0-compilation-on-gcc-7.patch new file mode 100644 index 00000000..be910720 --- /dev/null +++ b/fix-gcc-6.3.0-compilation-on-gcc-7.patch @@ -0,0 +1,28 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +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 + +--- + 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 new file mode 100644 index 00000000..e21955d3 --- /dev/null +++ b/fix-gdb-7.12-compilation-on-gcc-7.patch @@ -0,0 +1,32 @@ +From 909de2c5cc91b815d671f7018da2a925fbd19aaf Mon Sep 17 00:00:00 2001 +From: Tom Tromey +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 + + 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 + -- 2.51.2 From e0b4418b65bf20d80e9ee1074865651b3772082d Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Tue, 8 Aug 2017 19:33:33 +0200 Subject: [PATCH 09/14] =?UTF-8?q?[upd]=20r46=E2=86=92r47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 85 ++++++++++------------ PKGBUILD | 93 +++++++++++------------- devkitarm-add-patches.patch | 20 ++--- devkitarm-skip-libs.patch | 16 ++-- fix-gcc-6.3.0-compilation-on-gcc-7.patch | 28 ------- fix-gdb-7.12-compilation-on-gcc-7.patch | 32 -------- 6 files changed, 99 insertions(+), 175 deletions(-) delete mode 100644 fix-gcc-6.3.0-compilation-on-gcc-7.patch delete mode 100644 fix-gdb-7.12-compilation-on-gcc-7.patch diff --git a/.SRCINFO b/.SRCINFO index ee322a11..e47a0209 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 bed685db..443c9565 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,81 +1,78 @@ # Maintainer: carstene1ns - 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 ba133c74..8d77947d 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 79565668..5adf3213 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 be910720..00000000 --- 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 -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 - ---- - 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 e21955d3..00000000 --- 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 -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 - - 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 - -- 2.51.2 From 7e70387418e8c9b59bfbc1bc5c3b7244912f6040 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sat, 19 May 2018 12:03:38 +0200 Subject: [PATCH 10/14] =?UTF-8?q?[upd]=20r47=E2=86=92r48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 85 ++++++------------------ PKGBUILD | 124 ++++++++++-------------------------- devkitarm-add-patches.patch | 31 --------- devkitarm-skip-libs.patch | 76 ---------------------- devkitarm.fish | 3 - devkitarm.install | 6 ++ devkitarm.sh | 3 - 7 files changed, 58 insertions(+), 270 deletions(-) delete mode 100644 devkitarm-add-patches.patch delete mode 100644 devkitarm-skip-libs.patch diff --git a/.SRCINFO b/.SRCINFO index e47a0209..c0721361 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 443c9565..cb59a806 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,89 +1,36 @@ # Maintainer: carstene1ns - 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 8d77947d..00000000 --- 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 5adf3213..00000000 --- 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 c028a13d..ce33ea10 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 670fc5c0..a491932d 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 c97d0758..c928cc06 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 -- 2.51.2 From c4020fe381294d6a5e495bea13f8035649c2b374 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 3 Jul 2019 18:58:50 +0200 Subject: [PATCH 11/14] Get this to download again The dependency mirrors by the devkitPro team are gone for some reason. --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c0721361..b430dc22 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -19,10 +19,10 @@ pkgbase = devkitarm options = staticlibs options = emptydirs 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 = https://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.bz2 + source = https://ftp.gnu.org/gnu/gcc/gcc-8.1.0/gcc-8.1.0.tar.xz + source = ftp://sourceware.org/pub/newlib/newlib-3.0.0.tar.gz + source = https://ftp.gnu.org/gnu/gdb/gdb-8.0.tar.xz source = devkitarm.sh source = devkitarm.fish sha256sums = c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac diff --git a/PKGBUILD b/PKGBUILD index cb59a806..32101d31 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,10 +16,10 @@ options=(!strip libtool staticlibs emptydirs) depends=('flex' 'libmpc' 'python' 'xz') install=devkitarm.install source=("https://github.com/devkitPro/buildscripts/releases/download/v$_buildscriptsver/buildscripts-$_buildscriptsver.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.xz" - "https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-$_newlibver.tar.gz" - "https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-$_gdbver.tar.xz" + "https://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2" + "https://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.xz" + "ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz" + "https://ftp.gnu.org/gnu/gdb/gdb-$_gdbver.tar.xz" "devkitarm.sh" "devkitarm.fish") sha256sums=('c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac' -- 2.51.2 From 95f695a7d2a7e3053261f368fb9f18bcb158710f Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Wed, 28 Aug 2019 23:40:10 +0200 Subject: [PATCH 12/14] =?UTF-8?q?[upd]=20r48=E2=86=92r53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 32 ++++++++++++++------------- PKGBUILD | 55 ++++++++++++++++++++++++----------------------- devkitarm.install | 5 ----- 3 files changed, 45 insertions(+), 47 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b430dc22..fb5f6bdc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = devkitarm pkgdesc = ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development - pkgver = r48 + pkgver = r53 pkgrel = 1 url = http://devkitpro.org install = devkitarm.install @@ -10,26 +10,28 @@ pkgbase = devkitarm depends = libmpc 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 + provides = devkitARM + conflicts = devkitARM + noextract = binutils-2.32.tar.xz + noextract = gcc-9.1.0.tar.xz + noextract = newlib-3.1.0.tar.gz + noextract = gdb-8.2.1.tar.xz options = !strip options = libtool options = staticlibs options = emptydirs - source = https://github.com/devkitPro/buildscripts/releases/download/v20180514/buildscripts-20180514.tar.bz2 - source = https://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.bz2 - source = https://ftp.gnu.org/gnu/gcc/gcc-8.1.0/gcc-8.1.0.tar.xz - source = ftp://sourceware.org/pub/newlib/newlib-3.0.0.tar.gz - source = https://ftp.gnu.org/gnu/gdb/gdb-8.0.tar.xz + source = buildscripts-20190701.tar.gz::https://github.com/devkitPro/buildscripts/archive/v20190701.tar.gz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-2.32.tar.xz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-9.1.0.tar.xz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-3.1.0.tar.gz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-8.2.1.tar.xz source = devkitarm.sh source = devkitarm.fish - sha256sums = c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac - sha256sums = efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09 - sha256sums = 1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153 - sha256sums = c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332 - sha256sums = f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee + sha256sums = 3dbe4ee7ef819cb5ee0dd87632eea69cfe355d0f5723ce58343775a5ab6684d5 + sha256sums = 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 + sha256sums = 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + sha256sums = fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a + sha256sums = baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112 sha256sums = 2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0 sha256sums = 13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938 diff --git a/PKGBUILD b/PKGBUILD index 32101d31..d0f810e0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: carstene1ns - http://git.io/ctPKG pkgname=devkitarm -pkgver=r48 -_buildscriptsver=20180514 -_binutilsver=2.30 -_gccver=8.1.0 -_newlibver=3.0.0 -_gdbver=8.0 +pkgver=r53 +_buildscriptsver=20190701 +_binutilsver=2.32 +_gccver=9.1.0 +_newlibver=3.1.0 +_gdbver=8.2.1 pkgrel=1 pkgdesc="ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development" arch=('x86_64') @@ -14,56 +14,57 @@ url="http://devkitpro.org" license=('GPL') options=(!strip libtool staticlibs emptydirs) depends=('flex' 'libmpc' 'python' 'xz') +conflicts=('devkitARM') +provides=('devkitARM') install=devkitarm.install -source=("https://github.com/devkitPro/buildscripts/releases/download/v$_buildscriptsver/buildscripts-$_buildscriptsver.tar.bz2" - "https://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2" - "https://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.xz" - "ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz" - "https://ftp.gnu.org/gnu/gdb/gdb-$_gdbver.tar.xz" +source=(buildscripts-$_buildscriptsver.tar.gz::"https://github.com/devkitPro/buildscripts/archive/v$_buildscriptsver.tar.gz" + "https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-$_binutilsver.tar.xz" + "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.xz" "devkitarm.sh" "devkitarm.fish") -sha256sums=('c7c11bacfdbcc634d2d70ac17785a0701d5eaaa6753762ca57a918c3841119ac' - 'efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09' - '1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153' - 'c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332' - 'f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee' +sha256sums=('3dbe4ee7ef819cb5ee0dd87632eea69cfe355d0f5723ce58343775a5ab6684d5' + '0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04' + '79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0' + 'fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a' + 'baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112' '2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0' '13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938') -noextract=("binutils-$_binutilsver.tar.bz2" "gcc-$_gccver.tar.xz" +noextract=("binutils-$_binutilsver.tar.xz" "gcc-$_gccver.tar.xz" "newlib-$_newlibver.tar.gz" "gdb-$_gdbver.tar.xz") prepare() { - # reset build dir and force reinstalling already built tools + # reset build dir rm -rf build - [ -d buildscripts/.devkitARM ] && find buildscripts/.devkitARM \ - \( -name "installed-*" -o -name "installed" \) -delete - (cd buildscripts + (cd buildscripts-$_buildscriptsver + # force reinstalling already built tools + [ -d .devkitARM ] && find .devkitARM \( -name "installed-*" -o -name "installed" \) -delete + # generate config file for automatic build cat << END > config.sh #!bin/sh BUILD_DKPRO_PACKAGE=1 BUILD_DKPRO_INSTALLDIR="$srcdir"/build BUILD_DKPRO_SRCDIR="$srcdir" -BUILD_DKPRO_SKIP_LIBRARIES=1 BUILD_DKPRO_SKIP_TOOLS=1 BUILD_DKPRO_AUTOMATED=1 END - # do not try to download or extract tool packages and libraries - sed 's/ \$hostarchives/ ""/g;s/ \$targetarchives/ ""/g' -i build-devkit.sh + # do not try to download or extract tool packages + sed 's/ \$hostarchives/ ""/g;s/archives=\"devkitarm.*//' -i 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 # fix search path to use correct tools - sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i \ - build-devkit.sh + sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i build-devkit.sh ) } build() { - cd buildscripts + cd buildscripts-$_buildscriptsver # disable conflicting build flags unset CPPFLAGS diff --git a/devkitarm.install b/devkitarm.install index a491932d..aa2e7113 100644 --- a/devkitarm.install +++ b/devkitarm.install @@ -11,9 +11,4 @@ post_install() { 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 } -- 2.51.2 From 1628fa036b1420418b6502f5bcd78de909842699 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Mon, 16 Nov 2020 18:54:27 +0000 Subject: [PATCH 13/14] update to r55 --- .SRCINFO | 24 +++-- PKGBUILD | 31 ++++-- crtls-makefile.patch | 15 +++ gdb-and-rules.patch | 223 +++++++++++++++++++++++++++++++++++++++++++ rules-makefile.patch | 13 +++ 5 files changed, 287 insertions(+), 19 deletions(-) create mode 100644 crtls-makefile.patch create mode 100644 gdb-and-rules.patch create mode 100644 rules-makefile.patch diff --git a/.SRCINFO b/.SRCINFO index fb5f6bdc..8a7478ed 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = devkitarm pkgdesc = ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development - pkgver = r53 + pkgver = r55 pkgrel = 1 url = http://devkitpro.org install = devkitarm.install @@ -12,25 +12,31 @@ pkgbase = devkitarm depends = xz provides = devkitARM conflicts = devkitARM + noextract = devkitarm-rules-1.0.0.tar.xz + noextract = devkitarm-crtls-1.0.0.tar.xz noextract = binutils-2.32.tar.xz - noextract = gcc-9.1.0.tar.xz - noextract = newlib-3.1.0.tar.gz + noextract = gcc-10.1.0.tar.xz + noextract = newlib-3.3.0.tar.gz noextract = gdb-8.2.1.tar.xz options = !strip options = libtool options = staticlibs options = emptydirs - source = buildscripts-20190701.tar.gz::https://github.com/devkitPro/buildscripts/archive/v20190701.tar.gz + source = buildscripts-20201105.tar.gz::https://github.com/devkitPro/buildscripts/archive/v20201105.tar.gz + source = https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz + source = https://github.com/devkitPro/devkitarm-crtls/releases/download/v1.0.0/devkitarm-crtls-1.0.0.tar.xz source = https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-2.32.tar.xz - source = https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-9.1.0.tar.xz - source = https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-3.1.0.tar.gz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/gcc-10.1.0.tar.xz + source = https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-3.3.0.tar.gz source = https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-8.2.1.tar.xz source = devkitarm.sh source = devkitarm.fish - sha256sums = 3dbe4ee7ef819cb5ee0dd87632eea69cfe355d0f5723ce58343775a5ab6684d5 + sha256sums = a945e0300a9785a04fcaf0349c7c0fa63efbf93346a318cacb79d23f0840d543 + sha256sums = 10ad51c68eda70cba4ca6ed4d0bfd938ad33199f254cb0412dff6edabc56fa70 + sha256sums = db8b2f6a08909a3cdd476b8b2e2ece3270d3d6b2bf625ef3da1edd25f345643c sha256sums = 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - sha256sums = 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - sha256sums = fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a + sha256sums = b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2 + sha256sums = 58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66 sha256sums = baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112 sha256sums = 2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0 sha256sums = 13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938 diff --git a/PKGBUILD b/PKGBUILD index d0f810e0..160e92bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,15 @@ -# Maintainer: carstene1ns - http://git.io/ctPKG +# Maintainer: Corwin + +# Contributor: carstene1ns - http://git.io/ctPKG pkgname=devkitarm -pkgver=r53 -_buildscriptsver=20190701 +pkgver=r55 +_buildscriptsver=20201105 +_rulesver=1.0.0 +_crtlsver=1.0.0 _binutilsver=2.32 -_gccver=9.1.0 -_newlibver=3.1.0 +_gccver=10.1.0 +_newlibver=3.3.0 _gdbver=8.2.1 pkgrel=1 pkgdesc="ARM toolchain for GP32, Nintendo (3)DS and GBA homebrew development" @@ -18,20 +22,25 @@ conflicts=('devkitARM') provides=('devkitARM') install=devkitarm.install source=(buildscripts-$_buildscriptsver.tar.gz::"https://github.com/devkitPro/buildscripts/archive/v$_buildscriptsver.tar.gz" + "https://github.com/devkitPro/devkitarm-rules/releases/download/v$_rulesver/devkitarm-rules-$_rulesver.tar.xz" + "https://github.com/devkitPro/devkitarm-crtls/releases/download/v$_crtlsver/devkitarm-crtls-$_crtlsver.tar.xz" "https://github.com/devkitPro/buildscripts/releases/download/sources/binutils-$_binutilsver.tar.xz" "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.xz" "devkitarm.sh" "devkitarm.fish") -sha256sums=('3dbe4ee7ef819cb5ee0dd87632eea69cfe355d0f5723ce58343775a5ab6684d5' +sha256sums=('a945e0300a9785a04fcaf0349c7c0fa63efbf93346a318cacb79d23f0840d543' + '10ad51c68eda70cba4ca6ed4d0bfd938ad33199f254cb0412dff6edabc56fa70' + 'db8b2f6a08909a3cdd476b8b2e2ece3270d3d6b2bf625ef3da1edd25f345643c' '0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04' - '79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0' - 'fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a' + 'b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2' + '58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66' 'baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112' '2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0' '13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938') -noextract=("binutils-$_binutilsver.tar.xz" "gcc-$_gccver.tar.xz" +noextract=("devkitarm-rules-$_rulesver.tar.xz" "devkitarm-crtls-$_crtlsver.tar.xz" + "binutils-$_binutilsver.tar.xz" "gcc-$_gccver.tar.xz" "newlib-$_newlibver.tar.gz" "gdb-$_gdbver.tar.xz") prepare() { @@ -53,13 +62,15 @@ BUILD_DKPRO_AUTOMATED=1 END # do not try to download or extract tool packages - sed 's/ \$hostarchives/ ""/g;s/archives=\"devkitarm.*//' -i build-devkit.sh + sed 's/ \$hostarchives/ ""/g;s/archives=\"devkitarm.*/echo ""/' -i 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 # fix search path to use correct tools sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i build-devkit.sh + + patch --strip=1 < ../../gdb-and-rules.patch ) } diff --git a/crtls-makefile.patch b/crtls-makefile.patch new file mode 100644 index 00000000..42eba218 --- /dev/null +++ b/crtls-makefile.patch @@ -0,0 +1,15 @@ +--- Makefile.orig 2020-11-16 18:49:21.443000000 +0000 ++++ Makefile 2020-11-16 18:49:32.763553998 +0000 +@@ -16,9 +16,9 @@ + armv6k/fpu/3dsx_crt0.o + + install: all +- @mkdir -p $(DESTDIR)/opt/devkitpro/devkitARM/arm-none-eabi/lib +- @cp -v *.specs *.ld *.mem $(DESTDIR)/opt/devkitpro/devkitARM/arm-none-eabi/lib +- @cp -rv thumb armv6k *.o $(DESTDIR)/opt/devkitpro/devkitARM/arm-none-eabi/lib ++ @mkdir -p $(DESTDIR)/devkitARM/arm-none-eabi/lib ++ @cp -v *.specs *.ld *.mem $(DESTDIR)/devkitARM/arm-none-eabi/lib ++ @cp -rv thumb armv6k *.o $(DESTDIR)/devkitARM/arm-none-eabi/lib + + clean: + rm -fr thumb armv6k *.o diff --git a/gdb-and-rules.patch b/gdb-and-rules.patch new file mode 100644 index 00000000..1beb694a --- /dev/null +++ b/gdb-and-rules.patch @@ -0,0 +1,223 @@ +diff --unified --recursive --text buildscripts.old/dkarm-eabi/patches/gdb-8.2.1.patch buildscripts-20201105/dkarm-eabi/patches/gdb-8.2.1.patch +--- buildscripts.old/dkarm-eabi/patches/gdb-8.2.1.patch 2020-11-16 17:16:10.393390113 +0000 ++++ buildscripts-20201105/dkarm-eabi/patches/gdb-8.2.1.patch 2020-11-16 17:19:23.040287837 +0000 +@@ -595,3 +595,198 @@ + + /* Attach or detach a single observer, according to ATTACH. */ + ++diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c ++index 76f398b..3a72277 100644 ++--- a/sim/arm/armemu.c +++++ b/sim/arm/armemu.c ++@@ -1140,10 +1140,6 @@ ++ ++ /* EMULATION of ARM6. */ ++ ++-/* The PC pipeline value depends on whether ARM ++- or Thumb instructions are being executed. */ ++-ARMword isize; ++- ++ ARMword ++ #ifdef MODE32 ++ ARMul_Emulate32 (ARMul_State * state) ++diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c ++index 851d356..3a626c8 100644 ++--- a/sim/arm/arminit.c +++++ b/sim/arm/arminit.c ++@@ -40,6 +40,10 @@ ++ ARMword ARMul_ImmedTable[4096]; /* immediate DP LHS values */ ++ char ARMul_BitList[256]; /* number of bits in a byte table */ ++ +++/* The PC pipeline value depends on whether ARM +++ or Thumb instructions are being executed. */ +++ARMword isize; +++ ++ /***************************************************************************\ ++ * Call this routine once to set up the emulator's tables. * ++ \***************************************************************************/ ++diff --git a/sim/arm/maverick.c b/sim/arm/maverick.c ++index c112692..bae8c47 100644 ++--- a/sim/arm/maverick.c +++++ b/sim/arm/maverick.c ++@@ -19,6 +19,7 @@ ++ #include "armdefs.h" ++ #include "ansidecl.h" ++ #include "armemu.h" +++#include "maverick.h" ++ ++ /*#define CIRRUS_DEBUG 1 */ ++ #if CIRRUS_DEBUG ++@@ -30,36 +31,10 @@ ++ #define POS64(i) ( (~(i)) >> 63 ) ++ #define NEG64(i) ( (i) >> 63 ) ++ ++-/* Define Co-Processor instruction handlers here. */ ++- ++-/* Here's ARMulator's DSP definition. A few things to note: ++- 1) it has 16 64-bit registers and 4 72-bit accumulators ++- 2) you can only access its registers with MCR and MRC. */ ++- ++-/* We can't define these in here because this file might not be linked ++- unless the target is arm9e-*. They are defined in wrapper.c. ++- Eventually the simulator should be made to handle any coprocessor ++- at run time. */ ++-struct maverick_regs ++-{ ++- union ++- { ++- int i; ++- float f; ++- } upper; ++- ++- union ++- { ++- int i; ++- float f; ++- } lower; ++-}; ++- ++-union maverick_acc_regs ++-{ ++- long double ld; /* Acc registers are 72-bits. */ ++-}; ++- +++/* These variables are defined here and made extern in maverick.h for use +++ in wrapper.c for now. +++ Eventually the simulator should be made to handle any coprocessor at run +++ time. */ ++ struct maverick_regs DSPregs[16]; ++ union maverick_acc_regs DSPacc[4]; ++ ARMword DSPsc; ++diff --git a/sim/arm/maverick.h b/sim/arm/maverick.h ++new file mode 100644 ++index 0000000..2549d21 ++--- /dev/null +++++ b/sim/arm/maverick.h ++@@ -0,0 +1,46 @@ +++/* maverick.h -- Cirrus/DSP co-processor interface header +++ Copyright (C) 2003-2019 Free Software Foundation, Inc. +++ Contributed by Aldy Hernandez (aldyh@redhat.com). +++ +++ This program is free software; you can redistribute it and/or modify +++ it under the terms of the GNU General Public License as published by +++ the Free Software Foundation; either version 3 of the License, or +++ (at your option) any later version. +++ +++ This program is distributed in the hope that it will be useful, +++ but WITHOUT ANY WARRANTY; without even the implied warranty of +++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +++ GNU General Public License for more details. +++ +++ You should have received a copy of the GNU General Public License +++ along with this program. If not, see . */ +++ +++/* Define Co-Processor instruction handlers here. */ +++ +++/* Here's ARMulator's DSP definition. A few things to note: +++ 1) it has 16 64-bit registers and 4 72-bit accumulators +++ 2) you can only access its registers with MCR and MRC. */ +++ +++struct maverick_regs +++{ +++ union +++ { +++ int i; +++ float f; +++ } upper; +++ +++ union +++ { +++ int i; +++ float f; +++ } lower; +++}; +++ +++union maverick_acc_regs +++{ +++ long double ld; /* Acc registers are 72-bits. */ +++}; +++ +++extern struct maverick_regs DSPregs[16]; +++extern union maverick_acc_regs DSPacc[4]; +++extern ARMword DSPsc; ++diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c ++index fde5d8c..78a9192 100644 ++--- a/sim/arm/wrapper.c +++++ b/sim/arm/wrapper.c ++@@ -37,6 +37,7 @@ ++ #include "gdb/signals.h" ++ #include "libiberty.h" ++ #include "iwmmxt.h" +++#include "maverick.h" ++ ++ /* TODO: This should get pulled from the SIM_DESC. */ ++ host_callback *sim_callback; ++@@ -101,38 +102,6 @@ ++ fprintf (stderr, " %*s\n", size, opbuf); ++ } ++ ++-/* Cirrus DSP registers. ++- ++- We need to define these registers outside of maverick.c because ++- maverick.c might not be linked in unless --target=arm9e-* in which ++- case wrapper.c will not compile because it tries to access Cirrus ++- registers. This should all go away once we get the Cirrus and ARM ++- Coprocessor to coexist in armcopro.c-- aldyh. */ ++- ++-struct maverick_regs ++-{ ++- union ++- { ++- int i; ++- float f; ++- } upper; ++- ++- union ++- { ++- int i; ++- float f; ++- } lower; ++-}; ++- ++-union maverick_acc_regs ++-{ ++- long double ld; /* Acc registers are 72-bits. */ ++-}; ++- ++-struct maverick_regs DSPregs[16]; ++-union maverick_acc_regs DSPacc[4]; ++-ARMword DSPsc; ++- ++ static void ++ init (void) ++ { ++@@ -236,7 +205,7 @@ ++ { ++ int argvlen = 0; ++ int mach; ++- char **arg; +++ char * const *arg; ++ ++ init (); ++ +diff --unified --recursive --text buildscripts.old/dkarm-eabi/scripts/build-crtls.sh buildscripts-20201105/dkarm-eabi/scripts/build-crtls.sh +--- buildscripts.old/dkarm-eabi/scripts/build-crtls.sh 2020-11-16 17:16:10.393390113 +0000 ++++ buildscripts-20201105/dkarm-eabi/scripts/build-crtls.sh 2020-11-16 17:24:46.781920373 +0000 +@@ -14,7 +14,8 @@ + mkdir -p rules + cd rules + tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz +-make install ++patch -u Makefile -i "$SRCDIR"/../rules-makefile.patch ++DESTDIR=$DEVKITPRO make install + + #--------------------------------------------------------------------------------- + # Install and build the crt0 files +@@ -24,5 +25,6 @@ + mkdir -p crtls + cd crtls + tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz +-make install ++patch -u Makefile -i "$SRCDIR"/../crtls-makefile.patch ++DESTDIR=$DEVKITPRO make install + diff --git a/rules-makefile.patch b/rules-makefile.patch new file mode 100644 index 00000000..6281a308 --- /dev/null +++ b/rules-makefile.patch @@ -0,0 +1,13 @@ +--- Makefile.orig 2020-11-16 18:47:50.968860447 +0000 ++++ Makefile 2020-11-16 18:48:10.395145904 +0000 +@@ -8,8 +8,8 @@ + @echo "use dist or install targets" + + install: +- @mkdir -p $(DESTDIR)/opt/devkitpro/devkitARM +- @cp -v $(FILES) $(DESTDIR)/opt/devkitpro/devkitARM ++ @mkdir -p $(DESTDIR)/devkitARM ++ @cp -v $(FILES) $(DESTDIR)/devkitARM + + dist: + @tar -cJf devkitarm-rules-$(_MAJOR).$(_MINOR).$(_PATCH).tar.xz $(FILES) Makefile -- 2.51.2 From c183eb2d626f15fe2dc9bddc525e9af9c202a773 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Mon, 11 Jan 2021 04:50:21 +0000 Subject: [PATCH 14/14] include patches in sources supports custom SRCDEST for makepkg --- .SRCINFO | 6 ++++++ PKGBUILD | 12 +++++++++--- gdb-and-rules.patch | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8a7478ed..8463b8d3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -31,6 +31,9 @@ pkgbase = devkitarm source = https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-8.2.1.tar.xz source = devkitarm.sh source = devkitarm.fish + source = gdb-and-rules.patch + source = crtls-makefile.patch + source = rules-makefile.patch sha256sums = a945e0300a9785a04fcaf0349c7c0fa63efbf93346a318cacb79d23f0840d543 sha256sums = 10ad51c68eda70cba4ca6ed4d0bfd938ad33199f254cb0412dff6edabc56fa70 sha256sums = db8b2f6a08909a3cdd476b8b2e2ece3270d3d6b2bf625ef3da1edd25f345643c @@ -40,6 +43,9 @@ pkgbase = devkitarm sha256sums = baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112 sha256sums = 2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0 sha256sums = 13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938 + sha256sums = 925870adc0545f10dbcfd4333c503a18e6ef92c617b59b520c078c54b3c9c716 + sha256sums = 0acf8d4c07e7e193c662cd15c8f69a76d73fc07de33ed9116bbbae5196475d74 + sha256sums = 9bb96e00a7130a3a228759ee588f4614159ee7c323011b2885fbb5da878b2508 pkgname = devkitarm diff --git a/PKGBUILD b/PKGBUILD index 160e92bb..59f40918 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -29,7 +29,10 @@ source=(buildscripts-$_buildscriptsver.tar.gz::"https://github.com/devkitPro/bui "https://github.com/devkitPro/buildscripts/releases/download/sources/newlib-$_newlibver.tar.gz" "https://github.com/devkitPro/buildscripts/releases/download/sources/gdb-$_gdbver.tar.xz" "devkitarm.sh" - "devkitarm.fish") + "devkitarm.fish" + "gdb-and-rules.patch" + "crtls-makefile.patch" + "rules-makefile.patch") sha256sums=('a945e0300a9785a04fcaf0349c7c0fa63efbf93346a318cacb79d23f0840d543' '10ad51c68eda70cba4ca6ed4d0bfd938ad33199f254cb0412dff6edabc56fa70' 'db8b2f6a08909a3cdd476b8b2e2ece3270d3d6b2bf625ef3da1edd25f345643c' @@ -38,7 +41,10 @@ sha256sums=('a945e0300a9785a04fcaf0349c7c0fa63efbf93346a318cacb79d23f0840d543' '58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66' 'baaabb28026ba47e3fd56f0138e020c9b3d51e11800a3b220d736fae8e677112' '2162a4cf8ae8567b5ddff631474f28b6a0a5d0bce43915396b7dea602e2131e0' - '13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938') + '13357e81de7ec8d7ad7f9fb37a78c23c4f99c6f7ca67d3a0070eedc388deb938' + '925870adc0545f10dbcfd4333c503a18e6ef92c617b59b520c078c54b3c9c716' + '0acf8d4c07e7e193c662cd15c8f69a76d73fc07de33ed9116bbbae5196475d74' + '9bb96e00a7130a3a228759ee588f4614159ee7c323011b2885fbb5da878b2508') noextract=("devkitarm-rules-$_rulesver.tar.xz" "devkitarm-crtls-$_crtlsver.tar.xz" "binutils-$_binutilsver.tar.xz" "gcc-$_gccver.tar.xz" "newlib-$_newlibver.tar.gz" "gdb-$_gdbver.tar.xz") @@ -70,7 +76,7 @@ END # fix search path to use correct tools sed 's|$PATH:$TOOLPATH/$package/bin|$TOOLPATH/$package/bin:$PATH|' -i build-devkit.sh - patch --strip=1 < ../../gdb-and-rules.patch + patch --strip=1 < ../gdb-and-rules.patch ) } diff --git a/gdb-and-rules.patch b/gdb-and-rules.patch index 1beb694a..6672808e 100644 --- a/gdb-and-rules.patch +++ b/gdb-and-rules.patch @@ -208,7 +208,7 @@ diff --unified --recursive --text buildscripts.old/dkarm-eabi/scripts/build-crtl cd rules tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz -make install -+patch -u Makefile -i "$SRCDIR"/../rules-makefile.patch ++patch -u Makefile -i "$SRCDIR"/rules-makefile.patch +DESTDIR=$DEVKITPRO make install #--------------------------------------------------------------------------------- @@ -218,6 +218,6 @@ diff --unified --recursive --text buildscripts.old/dkarm-eabi/scripts/build-crtl cd crtls tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz -make install -+patch -u Makefile -i "$SRCDIR"/../crtls-makefile.patch ++patch -u Makefile -i "$SRCDIR"/crtls-makefile.patch +DESTDIR=$DEVKITPRO make install