use pkgrel for patchsets

Author: WinterMute

build-devkit.sh

@@ -54,12 +54,12 @@ function extract_and_patch {
 #---------------------------------------------------------------------------------
 	if [ ! -f extracted-$1-$2 ]; then
 		echo "extracting $1-$2"
-		tar -xf "$SRCDIR/$1-$2.tar.$3" || { echo "Error extracting "$1; exit 1; }
+		tar -xf "$SRCDIR/$1-$2.tar.$4" || { echo "Error extracting "$1; exit 1; }
 		touch extracted-$1-$2
 	fi
-	if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2.patch ]]; then
+	if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2-$3.patch ]]; then
 		echo "patching $1-$2"
-		$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2.patch || { echo "Error patching $1"; exit 1; }
+		$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2-$3.patch || { echo "Error patching $1"; exit 1; }
 		touch patched-$1-$2
 	fi
 }
@@ -224,16 +224,16 @@ cd $BUILDSCRIPTDIR
 mkdir -p $BUILDDIR
 cd $BUILDDIR
 
-extract_and_patch binutils $BINUTILS_VER xz
+extract_and_patch binutils $BINUTILS_VER $BINUTILS_PKGREL xz
 
-extract_and_patch gcc $GCC_VER xz
+extract_and_patch gcc $GCC_VER $GCC_PKGREL xz
 if [ "$GCC_DOWNLOAD_PREREQS" != "0" ] && [ ! -f downloaded_prereqs ]; then
   cd gcc-${GCC_VER}
   ./contrib/download_prerequisites && touch downloaded_prereqs
   cd ..
 fi
 
-extract_and_patch newlib $NEWLIB_VER gz
+extract_and_patch newlib $NEWLIB_VER $NEWLIB_PKGREL gz
 
 if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
 

patches/binutils-2.45.1.patch patches/binutils-2.45.1-2.patchpatches/binutils-2.45.1.patch renamed to patches/binutils-2.45.1-2.patch

@@ -7966,10 +7966,10 @@ index 000000000..5e81c5d42
 +#endif
 diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
 new file mode 100644
-index 000000000..71224902f
+index 000000000..3215d07f9
 --- /dev/null
 +++ b/libgloss/libsysbase/iosupport.c
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,134 @@
 +#include <stdlib.h>
 +#include <string.h>
 +#include <ctype.h>
@@ -8027,10 +8027,7 @@ index 000000000..71224902f
 +//---------------------------------------------------------------------------------
 +const devoptab_t *devoptab_list[STD_MAX] = {
 +//---------------------------------------------------------------------------------
-+	&dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
-+	&dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
-+	&dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
-+	&dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull
++	&dotab_stdnull, &dotab_stdnull, &dotab_stdnull
 +};
 +
 +//---------------------------------------------------------------------------------
@@ -8067,7 +8064,7 @@ index 000000000..71224902f
 +	int dev = FindDevice(name);
 +
 +	if ( -1 != dev ) {
-+		devoptab_list[dev] = &dotab_stdnull;
++		devoptab_list[dev] = NULL;
 +		return 0;
 +	}
 +
@@ -8082,12 +8079,11 @@ index 000000000..71224902f
 +	int devnum;
 +
 +	for ( devnum = 3;devnum <STD_MAX; devnum++ ) {
++		// null pointer is available
++		if ( devoptab_list[devnum] ) break;
 +
-+		if ( (!strcmp(devoptab_list[devnum]->name, device->name) &&
-+					strlen(devoptab_list[devnum]->name) == strlen(device->name) ) ||
-+			 		!strcmp(devoptab_list[devnum]->name, "stdnull")
-+			 )
-+			 break;
++		if ( !strcmp(devoptab_list[devnum]->name, device->name) && strlen(devoptab_list[devnum]->name) == strlen(device->name) )
++			break;
 +	}
 +
 +	if ( devnum == STD_MAX ) {

patches/gcc-15.2.0.patch patches/gcc-15.2.0-6.patchpatches/gcc-15.2.0.patch renamed to patches/gcc-15.2.0-6.patch

@@ -30,9 +30,12 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=15.2.0
     BINUTILS_VER=2.45.1
+    GCC_VER=15.2.0
     NEWLIB_VER=4.5.0.20241231
+    BINUTILS_PKGREL=2
+    GCC_PKGREL=6
+    NEWLIB_PKGREL=5
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
@@ -43,10 +46,13 @@ case "$VERSION" in
     _crtls_ver=${DKARM_CRTLS_VER}
   ;;
   "2" )
-    GCC_VER=15.2.0
     BINUTILS_VER=2.45.1
+    GCC_VER=15.2.0
     MN_BINUTILS_VER=2.24
     NEWLIB_VER=4.5.0.20241231
+    BINUTILS_PKGREL=2
+    GCC_PKGREL=6
+    NEWLIB_PKGREL=5
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
@@ -61,6 +67,9 @@ case "$VERSION" in
     GCC_VER=15.2.0
     BINUTILS_VER=2.45.1
     NEWLIB_VER=4.5.0.20241231
+    BINUTILS_PKGREL=2
+    GCC_PKGREL=6
+    NEWLIB_PKGREL=5
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf