include patches in sources

supports custom SRCDEST for makepkg

3 files changed, 17 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a7478ed9f52..8463b8d3577e 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 160e92bbeda2..59f4091839cf 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 1beb694acd76..6672808eb4a4 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