enable scripts for release

add rmdir
set errno appropriately
getcwd(NULL,0) now allocates buffer

README.TXT

@@ -1,52 +1,65 @@
 devkitPro build scripts
 --------------------------
 
-This readme will guide you through building devkitARM, devkitPPC or devkitPSP from source using a set of scripts.
+This readme will guide you through building devkitARM, devkitPPC or devkitPSP
+from source using a set of scripts.
+
+The windows versions of the toolchains are now cross compiled on linux using
+mingw-w64
+
+Preparing to build
+--------------------------
 
-The windows versions of the toolchains are now cross compiled on linux using mingw-w64
 required packages for building on debian/*buntu
 
-sudo apt-get install build-essential autoconf automake bison flex libncurses5-dev libreadline-dev texinfo pkg-config
+sudo apt-get install build-essential autoconf automake bison flex libncurses5-dev
+libreadline-dev texinfo pkg-config
 
-For building gcc libgmp, libmpfr and libmpc are required - these are built as static libraries to make packaging simpler.
+For building gcc libgmp, libmpfr and libmpc are required - these are built as
-If you're building the tools for personal use then the versions packaged by your chosen distro should suffice.
+static libraries to make packaging simpler. If you're building the tools for
+personal use then the versions packaged by your chosen distro should suffice.
 
 http://gmplib.org/
 http://www.mpfr.org/
 http://www.multiprecision.org/
 
-Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib, and libusb. Again these are built as static
+Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib,
-libraries for ease of packaging but you can probably use the versions supplied by your distro.
+and libusb. Again these are built as static libraries for ease of packaging
+but you can probably use the versions supplied by your distro.
 
 http://freeimage.sourceforge.net/
 http://www.zlib.net
 http://www.libusb.org
 
+Building gxtexconv for cube/wii needs GL/gl.h which can be obtained with
+sudo apt-get install mesa-common-dev
 
-Downloading the source packages
+To avoid having to manually answer prompts during the build the script will
--------------------------------
+read variables from config.sh if it exists. Copy config.sh.sample to config.sh
+and set the variables as appropriate for your build.
 
-When you run the build script it will ask you to choose from one of two options, one for if you have already downloaded the source packages and another for if you want it to download them for you (using wget or curl).
+The script will download the source packages it needs. These will be downloaded
+to the script directory by default but you can set BUILD_DKPRO_SRCDIR if you want
+to put them somewhere else.  When its finished you have the option to delete
+all temporary files, sources and their source packages.
 
-The top level shell script has now been unified and offers the option of devkitARM, devkitPPC or devkitPSP.
 
 Building the devkits
 --------------------
 
-Simply run the "build-devkit.sh" script in the same directory as this text file as shown below, then follow the prompts;
+Simply run the "build-devkit.sh" script in the same directory as this text file
+as shown below, then follow the prompts;
 
 ./build-devkit.sh
 
-Once the script finds the source packages they will be decompressed and the build process will begin.  When its finished you have the option to delete all temporary files, sources and their source packages.
+Several examples tarballs are provided for the platforms supported by devkitARM &
-
+devkitPPC, these include basic templates for starting your own projects.
-To avoid having to manually answer prompts during the build the script will read variables from config.sh if it exists. Copy config.sh.sample to config.sh and set the variables as appropriate for your build.
+See http://wiki.devkitpro.org/index.php/Getting_Started for links.
-
-Several examples tarballs are provided for the platforms supported by devkitARM & devkitPPC, these include basic templates for starting your own projects. See http://wiki.devkitpro.org/index.php/Getting_Started for links.
 
 Using devkitARM
 ---------------
 
-to use the built in crt0 and linkscript use arm-eabi-gcc to link your project
+to use the built in crt0 and linkscript use arm-none-eabi-gcc to link your project
 
 Several specs files are built in for the various platforms
 
@@ -58,25 +71,31 @@ Several specs files are built in for the various platforms
 	-specs=ds_cart for a DS arm7 binary which runs from GBA cart.
 	-specs=gp32.specs for standard GP32 app.
 	-specs=gp32_gpsdk.specs for official gamepark SDK GP32 app.
+	-specs=3dsx.specs for a 3DS homebrew binary.
 
 Using devkitPPC
 ---------------
 
-to use the built in crt0 and linkscript use powerpc-gekko-gcc to link your project, using the command line switch -mgcn for a bare bones system, -mogc to use libogc and the multi-threaded microkernel for gamecube, -mrvl for wii.
+to use the built in crt0 and linkscript use powerpc-eabi-gcc to link your project,
+using the command line switch -mgcn for a bare bones system, -mogc to use libogc and
+the multi-threaded microkernel for gamecube, -mrvl for wii.
 
 Using devkitPSP
 ---------------
 
-All you need to do now to use devkitPSP is make sure that your freshly built tools are in your PATH, something like this;
+All you need to do now to use devkitPSP is make sure that your freshly built tools
+are in your PATH, something like this;
 
 export PATH=$PATH:<path to devkitPSP>/bin
 
-(Obviously replace <path to devkitPSP> with the full path to the devkitPSP installation directory)
+(Obviously replace <path to devkitPSP> with the full path to the devkitPSP
+installation directory)
 
 Getting started
 ---------------
 
-The best thing to do next is test the compiler, so grab an examples tarball from sourceforge & run make in the top level.
+The best thing to do next is test the compiler, so grab an examples tarball
+from sourceforge & run make in the top level.
 
 Credits
 -------
@@ -84,6 +103,7 @@ Credits
 * Thanks to WinterMute for bringing us devkitPro, the website is http://www.devkitpro.org
 * Build scripts written by WinterMute and tied together by GreenGianT
 * Thanks to Mr Spiv, Honkey Kong, Raleigh and JoostP for OS X testing
+* libctru by Smealum, YellowS8, fincs, mtheall & WinterMute with contributions from many others.
 * libogc written and supplied by Shagkur. Additional code by WinterMute, Bushing, Marcan & Tybor
 * libgba by WinterMute
 * libnds by Joat, Dovoto and WinterMute with contributions from many others.

build-devkit.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
 # Build scripts for
-#	devkitARM release 43
+#	devkitARM release 44
 #	devkitPPC release 27
 #	devkitPSP release 17
 #---------------------------------------------------------------------------------
 
-if [ 1 -eq 1 ] ; then
+if [ 0 -eq 1 ] ; then
 	echo "Currently in release cycle, proceed with caution, do not report problems, do not ask for support."
 	echo "Please use the latest release buildscripts unless advised otherwise by devkitPro staff."
 	echo "http://sourceforge.net/projects/devkitpro/files/buildscripts/"
@@ -25,30 +25,30 @@ echo "https://sourceforge.net/tracker/?group_id=114505&atid=668553"
 echo
 
 LIBOGC_VER=1.8.12
-LIBGBA_VER=20090222
+LIBGBA_VER=20150106
-LIBNDS_VER=1.5.8
+LIBNDS_VER=1.5.10
-LIBCTRU_VER=0.1.0
+LIBCTRU_VER=0.4.0
-DEFAULT_ARM7_VER=0.5.24
+DEFAULT_ARM7_VER=0.5.27
-DSWIFI_VER=0.3.16
+DSWIFI_VER=0.3.17
 LIBMIRKO_VER=0.9.7
 MAXMOD_VER=1.0.9
-FILESYSTEM_VER=0.9.11
+FILESYSTEM_VER=0.9.12
-LIBFAT_VER=1.0.12
+LIBFAT_VER=1.0.14
 PSPSDK_VER=20120404
 GBATOOLS_VER=1.0.0
-DSTOOLS_VER=1.0.0
+DSTOOLS_VER=1.0.2
+GP32_TOOLS_VER=1.0.1
 GRIT_VER=0.8.12
-NDSTOOL_VER=1.50.1
+NDSTOOL_VER=1.50.3
 GENERAL_TOOLS_VER=1.0.0
 DLDITOOL_VER=1.24.0
-GXTEXCONV_VER=0.1.9
+GAMECUBE_TOOLS_VER=1.0.0
-GCDSPSUITE_VER=1.4.0
-ELF2DOL_VER=1.0.0
 WIILOAD_VER=0.5.1
 MMUTIL_VER=1.8.6
-DFU_UTIL_VER=0.7.1
+DFU_UTIL_VER=0.8.1
 STLINK_VER=0.5.8
-TOOLS3DS_VER=1.0.0
+TOOLS3DS_VER=1.0.3
+LINK3DS_VER=0.5.0
 
 #---------------------------------------------------------------------------------
 function extract_and_patch {
@@ -194,23 +194,29 @@ scriptdir=$(pwd)/$basedir/scripts
 archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.bz2"
 
 if [ $VERSION -eq 1 ]; then
+
 	targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
 		libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
 		default_arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
 		libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2"
-	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
+
+	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 gp32tools-$GP32_TOOLS_VER.tar.bz2
+		dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
 		general-tools-$GENERAL_TOOLS_VER.tar.bz2 dlditool-$DLDITOOL_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
-		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2"
+		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2 3dslink-$LINK3DS_VER.tar.bz2"
 fi
 
 if [ $VERSION -eq 2 ]; then
+
 	targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
-	hostarchives="gxtexconv-$GXTEXCONV_VER.tar.bz2 gcdspsuite-$GCDSPSUITE_VER.tar.bz2
+
-			wiiload-$WIILOAD_VER.tar.bz2 elf2dol-$ELF2DOL_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
+	hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
 fi
 
 if [ $VERSION -eq 3 ]; then
+
 	targetarchives="pspsdk-src-${PSPSDK_VER}.tar.bz2"
+
 fi
 
 if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
@@ -250,7 +256,10 @@ done
 
 for archive in $hostarchives
 do
-	tar -xjf "$SRCDIR/$archive"
+	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
+	if [ ! -d $destdir ]; then
+		tar -xjf "$SRCDIR/$archive"
+	fi
 done
 
 #---------------------------------------------------------------------------------

config.sh.sample

@@ -13,15 +13,6 @@
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_PACKAGE=0
 
-#---------------------------------------------------------------------------------
-# Download source packages
-#---------------------------------------------------------------------------------
-#   0: User selects manually
-#   1: already downloaded
-#   2: download packages
-#---------------------------------------------------------------------------------
-BUILD_DKPRO_DOWNLOAD=0
-
 #---------------------------------------------------------------------------------
 # Toolchain installation directory, comment if not specified
 #---------------------------------------------------------------------------------

cross-build-i686-w64-mingw32.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 export CROSSBUILD=i686-w64-mingw32
-export CROSSLIBPATH=/opt/i686-w64-mingw32/mingw/lib
+export CROSSLIBPATH=/opt/mingw32/mingw/lib
-export CROSSBINPATH=/opt/i686-w64-mingw32/mingw/bin
+export CROSSBINPATH=/opt/mingw32/mingw/bin
-export PATH=/opt/i686-w64-mingw32/bin:$PATH
+export PATH=/opt/mingw32/bin:$PATH
 export PKG_CONFIG_PATH=$CROSSLIBPATH/pkgconfig
-

dkarm-eabi/patches/gdb-7.8.2.patch

@@ -1,7 +1,7 @@
-diff -Nbaur gdb-7.7.1/gdb/Makefile.in gdb-7.7.1-arm/gdb/Makefile.in
+diff -NBaur gdb-7.8.2/gdb/Makefile.in gdb-7.8.2-arm/gdb/Makefile.in
---- gdb-7.7.1/gdb/Makefile.in	2014-05-05 22:51:24.000000000 +0100
+--- gdb-7.8.2/gdb/Makefile.in	2015-01-15 10:58:12.000000000 +0000
-+++ gdb-7.7.1-arm/gdb/Makefile.in	2014-05-18 17:05:16.105567001 +0100
++++ gdb-7.8.2-arm/gdb/Makefile.in	2015-01-21 17:13:14.155896000 +0000
-@@ -2307,10 +2307,8 @@
+@@ -2516,10 +2516,8 @@
  # Note that we put the dependencies into a .Tpo file, then move them
  # into place if the compile succeeds.  We need this because gcc does
  # not atomically write the dependency output file.
@@ -14,9 +14,9 @@ diff -Nbaur gdb-7.7.1/gdb/Makefile.in gdb-7.7.1-arm/gdb/Makefile.in
  @GMAKE_TRUE@else
  @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
  @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
-diff -Nbaur gdb-7.7.1/sim/common/Make-common.in gdb-7.7.1-arm/sim/common/Make-common.in
+diff -NBaur gdb-7.8.2/sim/common/Make-common.in gdb-7.8.2-arm/sim/common/Make-common.in
---- gdb-7.7.1/sim/common/Make-common.in	2014-01-08 09:23:36.000000000 +0000
+--- gdb-7.8.2/sim/common/Make-common.in	2015-01-15 10:58:12.000000000 +0000
-+++ gdb-7.7.1-arm/sim/common/Make-common.in	2014-05-18 17:05:16.105567001 +0100
++++ gdb-7.8.2-arm/sim/common/Make-common.in	2015-01-21 17:13:14.155896000 +0000
 @@ -415,10 +415,8 @@
  # Note that we put the dependencies into a .Tpo file, then move them
  # into place if the compile succeeds.  We need this because gcc does

dkarm-eabi/rules/3ds_rules

@@ -4,6 +4,8 @@ endif
 
 include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/armv6k $(PORTLIBS_PATH)/3ds
+
 CTRULIB	:=	$(DEVKITPRO)/libctru
 
 ifeq ($(strip $(APP_TITLE)),)
@@ -11,7 +13,7 @@ APP_TITLE	:=	$(notdir $(OUTPUT))
 endif
 
 ifeq ($(strip $(APP_DESCRIPTION)),)
-APP_DESCRIPTION	:=	Built with devkitARM & ctrulib
+APP_DESCRIPTION	:=	Built with devkitARM & libctru
 endif
 
 ifeq ($(strip $(APP_AUTHOR)),)
@@ -29,7 +31,7 @@ endif
 
 #---------------------------------------------------------------------------------
 %.3dsx: %.elf
-	@3dsxtool $< $@
+	@3dsxtool $< $@ $(_3DSXFLAGS)
 	@echo built ... $(notdir $@)
 
 #---------------------------------------------------------------------------------

dkarm-eabi/rules/base_rules

@@ -3,8 +3,7 @@ include $(DEVKITARM)/base_tools
 #---------------------------------------------------------------------------------
 # add portlibs path
 #---------------------------------------------------------------------------------
-export PORTLIBS	:=	$(DEVKITPRO)/portlibs/arm
+export PORTLIBS_PATH	:=	$(DEVKITPRO)/portlibs
-export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 
 
 #---------------------------------------------------------------------------------

dkarm-eabi/rules/base_tools

@@ -1,13 +1,11 @@
 #---------------------------------------------------------------------------------
-# change shell on Snow Leopard
+# make sure we have bash on OSX
 #---------------------------------------------------------------------------------
 UNAME_S	:=	$(shell uname -s)
 UNAME_R	:=	$(shell uname -r)
 
 ifneq (,$(findstring Darwin,$(UNAME_S)))
-	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
+	export SHELL=/bin/bash
-		export SHELL=/bin/bash
-	endif
 endif
 #---------------------------------------------------------------------------------
 # path to tools

dkarm-eabi/rules/ds_rules

@@ -4,7 +4,9 @@ endif
 
 include $(DEVKITARM)/base_rules
 
-LIBNDS	:=	$(DEVKITPRO)/libnds
+PORTLIBS	:=	$(PORTLIBS_PATH)/nds $(PORTLIBS_PATH)/armv5te
+
+LIBNDS		:=	$(DEVKITPRO)/libnds
 
 ifeq ($(strip $(GAME_TITLE)),)
 GAME_TITLE	:=	$(notdir $(OUTPUT))

dkarm-eabi/rules/gba_rules

@@ -4,6 +4,8 @@ endif
 
 include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/gba $(PORTLIBS_PATH)/armv4
+
 LIBGBA	:=	$(DEVKITPRO)/libgba
 
 #---------------------------------------------------------------------------------

dkarm-eabi/rules/gp32_rules

@@ -1,5 +1,7 @@
 -include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/gp32 $(PORTLIBS_PATH)/armv4
+
 LIBMIRKO	:=	$(DEVKITPRO)/libmirko
 
 #---------------------------------------------------------------------------------

dkarm-eabi/scripts/build-crtls.sh

@@ -21,7 +21,7 @@ $MAKE CRT=gp32_gpsdk
 $MAKE CRT=ds_arm7
 $MAKE CRT=ds_arm9
 $MAKE CRT=ds_cart
-$MAKE CRT=3dsx
+$target-gcc -march=armv6k -mfloat-abi=hard -c 3dsx_crt0.s -o armv6k/fpu/3dsx_crt0.o
 
 cd $BUILDDIR/libgba-$LIBGBA_VER
 $MAKE || { echo "error building libgba"; exit 1; }

dkarm-eabi/scripts/build-gcc.sh

@@ -46,7 +46,7 @@ then
 		--enable-poison-system-directories \
 		--enable-interwork --enable-multilib \
 		--disable-dependency-tracking \
-		--disable-threads --disable-win32-registry --disable-nls --disable-debug\
+		--enable-threads --disable-win32-registry --disable-nls --disable-debug\
 		--disable-libmudflap --disable-libssp --disable-libgomp \
 		--disable-libstdcxx-pch \
 		--target=$target \
@@ -54,7 +54,7 @@ then
 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 		--prefix=$prefix \
 		--enable-lto $plugin_ld\
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 43" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 44" \
 		$CROSS_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
@@ -84,12 +84,9 @@ cd $target/newlib
 
 if [ ! -f configured-newlib ]
 then
-	CFLAGS_FOR_TARGET="-DREENTRANT_SYSCALLS_PROVIDED -D__DEFAULT_UTF8__ -O2" ../../newlib-$NEWLIB_VER/configure \
+	../../newlib-$NEWLIB_VER/configure \
 	--disable-newlib-supplied-syscalls \
 	--enable-newlib-mb \
-	--enable-newlib-io-long-long \
-	--enable-newlib-io-c99-formats \
-	--enable-newlib-io-pos-args \
 	--target=$target \
 	--prefix=$prefix \
 	|| { echo "Error configuring newlib"; exit 1; }

dkarm-eabi/scripts/build-tools.sh

@@ -10,11 +10,11 @@ do
 		touch configured
 	fi
 	if [ ! -f built ]; then
-		$MAKE || { echo "error building $archive"; exit 1; }
+		$MAKE || { echo "error building $dir"; exit 1; }
 		touch built
 	fi
 	if [ ! -f installed ]; then
-		$MAKE install || { echo "error installing $archive"; exit 1; }
+		$MAKE install || { echo "error installing $dir"; exit 1; }
 		touch installed
 	fi
 done

select_toolchain.sh

@@ -31,9 +31,9 @@ done
 case "$VERSION" in
   "1" )
     GCC_VER=4.9.2
-    BINUTILS_VER=2.24
+    BINUTILS_VER=2.25
-    NEWLIB_VER=2.1.0
+    NEWLIB_VER=2.2.0
-    GDB_VER=7.7.1
+    GDB_VER=7.8.2
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi