summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Eriksson2016-09-03 18:06:45 +0200
committerSimon Eriksson2016-09-03 18:06:45 +0200
commit7ddd333ef4c63543d0c5ef206a26eb59e6bf214c (patch)
treecd5c50edac23e605d3c75acd365090e696d91cf2
parent97b6874c42a643a35ec817921578b49afb37755a (diff)
downloadaur-7ddd333ef4c63543d0c5ef206a26eb59e6bf214c.tar.gz
Add patch for compilation error with newer GAS versions
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--inthandler.diff12
3 files changed, 23 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c991b991452..19af22737b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,11 +11,14 @@ pkgbase = libdragon-git
depends = mips64-elf-newlib
source = git://github.com/DragonMinded/libdragon.git
source = noconvtool.diff
+ source = inthandler.diff
sha256sums = SKIP
sha256sums = ec37b8d10ee3911979092916a6b9361e62b13a3a3cfb1736281d6baf304bfc95
+ sha256sums = 1ee0a47efcdc9aabd83f52b4b21e910362473fd79fdd810252f6f746655710a8
pkgname = libdragon-git
- pkgdesc = Open source library for Nintendo 64 development
+ pkgdesc = Open source library for Nintendo 64 game development
+ install = libdragon.install
arch = any
depends = mips64-elf-newlib
provides = libdragon
diff --git a/PKGBUILD b/PKGBUILD
index 46b322b87f9..7c4bae7f1a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,10 @@ arch=('i686' 'x86_64')
license=('custom:UNLICENSE')
makedepends=('git' 'mips64-elf-gcc-stage1')
depends=('libpng' 'mips64-elf-newlib')
-source=("git://github.com/DragonMinded/libdragon.git" "noconvtool.diff")
-sha256sums=('SKIP' 'ec37b8d10ee3911979092916a6b9361e62b13a3a3cfb1736281d6baf304bfc95')
+source=("git://github.com/DragonMinded/libdragon.git" "noconvtool.diff" "inthandler.diff")
+sha256sums=('SKIP'
+ 'ec37b8d10ee3911979092916a6b9361e62b13a3a3cfb1736281d6baf304bfc95'
+ '1ee0a47efcdc9aabd83f52b4b21e910362473fd79fdd810252f6f746655710a8')
pkgver() {
cd libdragon
@@ -19,6 +21,7 @@ pkgver() {
prepare(){
cd libdragon
patch -p1 < "${srcdir}/noconvtool.diff"
+ patch -p1 < "${srcdir}/inthandler.diff"
}
build(){
@@ -28,13 +31,13 @@ build(){
}
package_libdragon-git(){
- pkgdesc="Open source library for Nintendo 64 development"
+ pkgdesc="Open source library for Nintendo 64 game development"
options=('!buildflags' '!strip' '!emptydirs')
provides=('libdragon')
conflicts=('libdragon')
arch=('any')
depends=('mips64-elf-newlib')
- install=('libdragon.install')
+ install='libdragon.install'
cd libdragon
diff --git a/inthandler.diff b/inthandler.diff
new file mode 100644
index 00000000000..80a2537fa0f
--- /dev/null
+++ b/inthandler.diff
@@ -0,0 +1,12 @@
+diff --git a/src/inthandler.S b/src/inthandler.S
+index 1e81563..3e958a8 100644
+--- a/src/inthandler.S
++++ b/src/inthandler.S
+@@ -235,7 +235,6 @@ endint:
+
+ .section .bss
+ .global __baseRegAddr
+- .long __baseRegAddr
+
+ .align 8
+ __baseRegAddr: