Skip to content

Commit 0ddec6c

Browse files
committed
use pkgrel for patchsets
1 parent 8d894d5 commit 0ddec6c

5 files changed

Lines changed: 25 additions & 20 deletions

File tree

build-devkit.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ function extract_and_patch {
5454
#---------------------------------------------------------------------------------
5555
if [ ! -f extracted-$1-$2 ]; then
5656
echo "extracting $1-$2"
57-
tar -xf "$SRCDIR/$1-$2.tar.$3" || { echo "Error extracting "$1; exit 1; }
57+
tar -xf "$SRCDIR/$1-$2.tar.$4" || { echo "Error extracting "$1; exit 1; }
5858
touch extracted-$1-$2
5959
fi
60-
if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2.patch ]]; then
60+
if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2-$3.patch ]]; then
6161
echo "patching $1-$2"
62-
$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2.patch || { echo "Error patching $1"; exit 1; }
62+
$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2-$3.patch || { echo "Error patching $1"; exit 1; }
6363
touch patched-$1-$2
6464
fi
6565
}
@@ -224,16 +224,16 @@ cd $BUILDSCRIPTDIR
224224
mkdir -p $BUILDDIR
225225
cd $BUILDDIR
226226

227-
extract_and_patch binutils $BINUTILS_VER xz
227+
extract_and_patch binutils $BINUTILS_VER $BINUTILS_PKGREL xz
228228

229-
extract_and_patch gcc $GCC_VER xz
229+
extract_and_patch gcc $GCC_VER $GCC_PKGREL xz
230230
if [ "$GCC_DOWNLOAD_PREREQS" != "0" ] && [ ! -f downloaded_prereqs ]; then
231231
cd gcc-${GCC_VER}
232232
./contrib/download_prerequisites && touch downloaded_prereqs
233233
cd ..
234234
fi
235235

236-
extract_and_patch newlib $NEWLIB_VER gz
236+
extract_and_patch newlib $NEWLIB_VER $NEWLIB_PKGREL gz
237237

238238
if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
239239

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7966,10 +7966,10 @@ index 000000000..5e81c5d42
79667966
+#endif
79677967
diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
79687968
new file mode 100644
7969-
index 000000000..71224902f
7969+
index 000000000..3215d07f9
79707970
--- /dev/null
79717971
+++ b/libgloss/libsysbase/iosupport.c
7972-
@@ -0,0 +1,138 @@
7972+
@@ -0,0 +1,134 @@
79737973
+#include <stdlib.h>
79747974
+#include <string.h>
79757975
+#include <ctype.h>
@@ -8027,10 +8027,7 @@ index 000000000..71224902f
80278027
+//---------------------------------------------------------------------------------
80288028
+const devoptab_t *devoptab_list[STD_MAX] = {
80298029
+//---------------------------------------------------------------------------------
8030-
+ &dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
8031-
+ &dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
8032-
+ &dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull,
8033-
+ &dotab_stdnull, &dotab_stdnull, &dotab_stdnull, &dotab_stdnull
8030+
+ &dotab_stdnull, &dotab_stdnull, &dotab_stdnull
80348031
+};
80358032
+
80368033
+//---------------------------------------------------------------------------------
@@ -8067,7 +8064,7 @@ index 000000000..71224902f
80678064
+ int dev = FindDevice(name);
80688065
+
80698066
+ if ( -1 != dev ) {
8070-
+ devoptab_list[dev] = &dotab_stdnull;
8067+
+ devoptab_list[dev] = NULL;
80718068
+ return 0;
80728069
+ }
80738070
+
@@ -8082,12 +8079,11 @@ index 000000000..71224902f
80828079
+ int devnum;
80838080
+
80848081
+ for ( devnum = 3;devnum <STD_MAX; devnum++ ) {
8082+
+ // null pointer is available
8083+
+ if ( devoptab_list[devnum] ) break;
80858084
+
8086-
+ if ( (!strcmp(devoptab_list[devnum]->name, device->name) &&
8087-
+ strlen(devoptab_list[devnum]->name) == strlen(device->name) ) ||
8088-
+ !strcmp(devoptab_list[devnum]->name, "stdnull")
8089-
+ )
8090-
+ break;
8085+
+ if ( !strcmp(devoptab_list[devnum]->name, device->name) && strlen(devoptab_list[devnum]->name) == strlen(device->name) )
8086+
+ break;
80918087
+ }
80928088
+
80938089
+ if ( devnum == STD_MAX ) {

select_toolchain.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ done
3030

3131
case "$VERSION" in
3232
"1" )
33-
GCC_VER=15.2.0
3433
BINUTILS_VER=2.45.1
34+
GCC_VER=15.2.0
3535
NEWLIB_VER=4.5.0.20241231
36+
BINUTILS_PKGREL=2
37+
GCC_PKGREL=6
38+
NEWLIB_PKGREL=5
3639
basedir='dkarm-eabi'
3740
package=devkitARM
3841
target=arm-none-eabi
@@ -43,10 +46,13 @@ case "$VERSION" in
4346
_crtls_ver=${DKARM_CRTLS_VER}
4447
;;
4548
"2" )
46-
GCC_VER=15.2.0
4749
BINUTILS_VER=2.45.1
50+
GCC_VER=15.2.0
4851
MN_BINUTILS_VER=2.24
4952
NEWLIB_VER=4.5.0.20241231
53+
BINUTILS_PKGREL=2
54+
GCC_PKGREL=6
55+
NEWLIB_PKGREL=5
5056
basedir='dkppc'
5157
package=devkitPPC
5258
target=powerpc-eabi
@@ -61,6 +67,9 @@ case "$VERSION" in
6167
GCC_VER=15.2.0
6268
BINUTILS_VER=2.45.1
6369
NEWLIB_VER=4.5.0.20241231
70+
BINUTILS_PKGREL=2
71+
GCC_PKGREL=6
72+
NEWLIB_PKGREL=5
6473
basedir='dka64'
6574
package=devkitA64
6675
target=aarch64-none-elf

0 commit comments

Comments
 (0)