build libraries when enabled

build-devkit.sh

@@ -5,12 +5,11 @@
 #	devkitA64 release 9
 #---------------------------------------------------------------------------------
 
-if [ 0 -eq 1 ] ; then
-	echo "Currently in release cycle, proceed with caution, do not report problems, do not ask for support."
+if [ 1 -eq 1 ] ; then
 	echo "Please use the latest release buildscripts unless advised otherwise by devkitPro staff."
-	echo "https://github.com/devkitPro/buildscripts/releases"
+	echo "https://github.com/devkitPro/buildscripts/releases/latest"
 	echo
-	echo "The scripts in the git repository are quite often dependent on things which currently only exist"
+	echo "The scripts in the git repository may be dependent on things which currently only exist"
 	echo "on developer machines. This is not a bug, use stable releases."
 	exit 1
 fi
@@ -26,15 +25,15 @@ echo
 
 GENERAL_TOOLS_VER=1.0.2
 
-LIBGBA_VER=0.5.0
+LIBGBA_VER=0.5.1
 GBATOOLS_VER=1.1.0
 
-LIBNDS_VER=1.7.1
-DEFAULT_ARM7_VER=0.7.3
+LIBNDS_VER=1.7.2
+DEFAULT_ARM7_VER=0.7.4
 DSWIFI_VER=0.4.2
 MAXMOD_VER=1.0.11
-FILESYSTEM_VER=0.9.13-1
-LIBFAT_VER=1.1.2
+FILESYSTEM_VER=0.9.14
+LIBFAT_VER=1.1.3
 DSTOOLS_VER=1.2.1
 GRIT_VER=0.8.15
 NDSTOOL_VER=2.1.1
@@ -56,10 +55,10 @@ PICASSO_VER=2.7.0
 TEX3DS_VER=1.0.0
 
 GP32_TOOLS_VER=1.0.3
-LIBMIRKO_VER=0.9.7
+LIBMIRKO_VER=0.9.8
 
-SWITCH_TOOLS_VER=1.2.0
-LIBNX_VER=1.0.0
+SWITCH_TOOLS_VER=1.4.0
+LIBNX_VER=1.2.1
 
 OSXMIN=${OSXMIN:-10.9}
 
@@ -154,9 +153,11 @@ export PATH=$PATH:$TOOLPATH/$package/bin
 
 if [ ! -z $CROSSBUILD ]; then
 	prefix=$INSTALLDIR/$CROSSBUILD/$package
+	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
 	CROSS_PARAMS="--build=`./config.guess` --host=$CROSSBUILD"
 	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
 else
+	toolsprefix=$INSTALLDIR/tools
 	prefix=$INSTALLDIR/$package
 fi
 
@@ -186,8 +187,6 @@ case $PLATFORM in
     ;;
 	MINGW32* )
 		cflags="-D__USE_MINGW_ACCESS"
-# horrid hack to get -flto to work on windows
-		plugin_ld="--with-plugin-ld=ld"
     ;;
 esac
 
@@ -208,11 +207,11 @@ 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
+		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  citro3d-src-${CITRO3D_VER}.tar.bz2
 		citro2d-src-${CITRO2D_VER}.tar.bz2"
 
-	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 gp32tools-$GP32_TOOLS_VER.tar.bz2
+	hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$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 mmutil-$MMUTIL_VER.tar.bz2
 		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2
@@ -230,6 +229,8 @@ fi
 
 if [ $VERSION -eq 3 ]; then
 
+	targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
+
 	hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
 
 fi
@@ -246,7 +247,7 @@ for archive in $archives $targetarchives $hostarchives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
-		$FETCH https://github.com/devkitPro/buildscripts/releases/download/sources/$archive || { echo "Error: Failed to download $archive"; exit 1; }
+		$FETCH https://downloads.devkitpro.org/$archive || { echo "Error: Failed to download $archive"; exit 1; }
 	fi
 done
 
@@ -323,5 +324,13 @@ fi
 
 
 echo
-echo "note: Add the following to your environment;  DEVKITPRO=$TOOLPATH $toolchain=$TOOLPATH/$package"
+echo "note: Add the following to your environment;"
+echo
+echo "  DEVKITPRO=$TOOLPATH"
+if [ "$toolchain" != "DEVKITA64" ]; then
+echo "  $toolchain=$TOOLPATH/$package"
+fi
+echo
+echo "add $TOOLPATH/tools/bin to your PATH"
+echo
 echo

dka64/scripts/build-gcc.sh

@@ -86,6 +86,11 @@ fi
 unset CFLAGS
 cd $BUILDDIR
 
+OLD_CC=$CC
+OLDCXX=$CXX
+unset CC
+unset CXX
+
 #---------------------------------------------------------------------------------
 # build and install newlib
 #---------------------------------------------------------------------------------
@@ -118,6 +123,9 @@ then
 	touch installed-newlib
 fi
 
+export CC=$OLD_CC
+export CXX=$OLD_CXX
+
 #---------------------------------------------------------------------------------
 # build and install the final compiler
 #---------------------------------------------------------------------------------

dka64/scripts/build-libs.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export DEVKITPRO=$TOOLPATH
+
+cd $BUILDDIR/libnx-$LIBNX_VER
+$MAKE || { echo "error building libnx"; exit 1; }
+$MAKE install || { echo "error installing libnx"; exit 1; }

dka64/scripts/build-tools.sh

@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=/opt/devkitpro/tools $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then

dkarm-eabi/scripts/build-gcc.sh

@@ -60,7 +60,7 @@ then
 		--with-newlib \
 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 		--prefix=$prefix \
-		--enable-lto $plugin_ld\
+		--enable-lto\
 		--with-system-zlib \
 		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 48" \
 		$CROSS_PARAMS \

dkarm-eabi/scripts/build-tools.sh

@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$prefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then

dkppc/scripts/build-tools.sh

@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$prefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then