From a6c67408af602fdec69f634b281969920745e751 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Wed, 30 Jan 2019 12:49:32 +0000
Subject: [PATCH] devkitPPC: separate rules files for independent update

---
 build-devkit.sh             | 7 +++++--
 dkppc/scripts/build-gcc.sh  | 6 +-----
 dkppc/scripts/build-libs.sh | 6 ++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build-devkit.sh b/build-devkit.sh
index da47ff9..9d6b6c9 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -46,8 +46,9 @@ DFU_UTIL_VER=0.9.1
 STLINK_VER=1.2.3
 
 GAMECUBE_TOOLS_VER=1.0.2
-LIBOGC_VER=1.8.20
+LIBOGC_VER=1.8.21
 WIILOAD_VER=0.5.1
+DKPPC_RULES_VER=1.0.0
 
 LIBCTRU_VER=1.5.0
 CITRO3D_VER=1.4.0
@@ -234,7 +235,7 @@ if [ $VERSION -eq 2 ]; then
 
 	hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
 
-	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
+	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
 fi
 
 if [ $VERSION -eq 3 ]; then
@@ -305,6 +306,8 @@ if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ];
   . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
 fi
 
+cd $BUILDSCRIPTDIR
+
 if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
 	cp -v	$CROSSBINPATH//libwinpthread-1.dll $prefix/bin
 fi
diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh
index 3963dd0..dc5e919 100755
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -97,7 +97,7 @@ then
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix\
 	--with-system-zlib\
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 33" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 34" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
@@ -185,10 +185,6 @@ rm -fr $prefix/$target/sys-include
 
 echo "installing linkscripts ..."
 cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
-#---------------------------------------------------------------------------------
-# copy base rulesets
-#---------------------------------------------------------------------------------
-cp $BUILDSCRIPTDIR/dkppc/rules/* $prefix
 
 cd $BUILDDIR
 
diff --git a/dkppc/scripts/build-libs.sh b/dkppc/scripts/build-libs.sh
index f0debbf..d271da7 100644
--- a/dkppc/scripts/build-libs.sh
+++ b/dkppc/scripts/build-libs.sh
@@ -3,6 +3,12 @@
 export DEVKITPPC=$TOOLPATH/devkitPPC
 export DEVKITPRO=$TOOLPATH
 
+cd $BUILDDIR
+mkdir -p rules
+cd rules
+tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
+make install
+
 cd $BUILDDIR/libogc-$LIBOGC_VER
 
 if [ ! -f installed ]; then