Merge pull request #118 from pspdev/small-improvements

Small improvements

Author: carstene1ns

README.md

@@ -8,7 +8,7 @@ How do I use it?
 
 1. Set up your environment by installing the following software:
 
-        autoconf, automake, bison, flex, gcc, g++/gcc-c++, libusb-dev, make, ncurses, patch, readline, subversion, texinfo, wget, mpc, gmp, libelf, mpfr, git
+        autoconf, automake, bison, bzip2, flex, gcc, g++/gcc-c++, gzip, libusb-dev, make, ncurses, patch, readline, subversion, texinfo, xz-utils, wget, libelf, git
 
 2. Set the PSPDEV and PATH environmental variables:
 
@@ -32,30 +32,30 @@ How do I use it?
 > After you are done use `swapoff -a` disable the swapfile. Finally you can
 > remove it with `rm`.
 
-Ubuntu
-------
+Ubuntu/Debian
+-------------
 
-1. Install the required packages by running.
+1. Install the required packages by running:
 
-        sudo apt-get install g++ build-essential autoconf automake cmake doxygen bison flex libncurses5-dev libsdl1.2-dev libreadline-dev libusb-dev texinfo libgmp3-dev libmpfr-dev libelf-dev libmpc-dev libfreetype6-dev zlib1g-dev libtool libtool-bin subversion git tcl unzip wget
+    sudo ./prepare-debian-ubuntu.sh
 
 2. Build and install the toolchain and SDK.
 
-        sudo ./toolchain-sudo.sh
+    sudo ./toolchain-sudo.sh
 
 > NOTE: If you do not wish for the toolchain to be installed in /usr/local/pspdev then edit toolchain-sudo.sh and change the INSTALLDIR variable.
 
 OSX
 ---
 
 1. Install [`port`][MacPorts] or [`brew`][HomeBrew].
-2. Run `prepare-mac-os.sh`. This will auto-install all the libraries you will need before building.
+2. Install all the libraries you will need before building by running:
 
-        sudo ./prepare-mac-os.sh
+    sudo ./prepare-mac-os.sh
 
 3. Build and install the toolchain and SDK.
 
-        sudo ./toolchain-sudo.sh
+    sudo ./toolchain-sudo.sh
 
 Where do I go from here?
 ========================

common.sh

@@ -20,6 +20,7 @@ function auto_extract
         "tar") tar --no-same-owner -xf $path ;;
         "gz"|"tgz") tar --no-same-owner -xzf $path ;;
         "bz2"|"tbz2") tar --no-same-owner -xjf $path ;;
+        "xz"|"txz") tar --no-same-owner -xJf $path ;;
         "zip") unzip $path ;;
         *) echo "I don't know how to extract $ext archives!"; return 1 ;;
     esac

depends/check-dependencies.sh

@@ -62,11 +62,6 @@ function check_aclocal
     missing_depends+=($1); return 1
 }
 
-
-
-# check_header    gmp             gmp.h
-# check_header    mpc             mpc.h
-# check_header    mpfr            mpfr.h
 check_header    libelf          elf.h libelf.h libelf/libelf.h gelf.h libelf/gelf.h
 check_header    libusb          usb.h
 check_header    ncurses         ncurses.h ncurses/ncurses.h
@@ -105,10 +100,10 @@ if [ "$(uname)" == "Darwin" ]; then
 
     # GNU libtool will be prepended with letter 'g' to prevent conflicts with
     # the one comes along with OS X.
-    check_program      glibtool
+    check_program      glibtoolize
 else
     check_header       readline     readline.h readline/readline.h
-    check_program      libtool
+    check_program      libtoolize
 fi
 
 if [ ${#missing_depends[@]} -ne 0 ]; then

patches/patch-gcc_cp_cfns.h

@@ -1,7 +1,10 @@
 #!/bin/bash
 
 # Install build dependencies
-sudo apt-get install $@ g++ build-essential autoconf automake cmake doxygen bison flex libncurses5-dev libsdl1.2-dev libreadline-dev libusb-dev texinfo libgmp3-dev libmpfr-dev libelf-dev libmpc-dev libfreetype6-dev zlib1g-dev libtool libtool-bin subversion git tcl unzip
+sudo apt-get install $@ g++ build-essential autoconf automake cmake doxygen \
+  bison flex libncurses5-dev libsdl1.2-dev libreadline-dev libusb-dev texinfo \
+  libelf-dev libfreetype6-dev zlib1g-dev libtool libtool-bin subversion git \
+  tcl wget unzip bzip2 gzip xz-utils
 
 # Make `/bin/sh` an alias for `/bin/bash` instead of `/bin/dash` - which is
 # faster, but doesn't play nice with some autotools scripts in psp-ports.

prepare-debian-ubuntu.sh

@@ -10,13 +10,12 @@ install_libusb() {
 }
 
 if [ -e "/opt/local/bin/port" ]; then
-	sudo port install automake cmake doxygen libelf libmpc libusb wget
+	sudo port install automake cmake doxygen libelf libusb wget xz
 
 	install_libusb
 elif [ -e "/usr/local/bin/brew" ]; then
 	CURRENT_USER=$(stat -f '%Su' /dev/console)
-	sudo -u $CURRENT_USER brew install automake cmake doxygen libelf libmpc libusb libusb-compat wget
+	sudo -u $CURRENT_USER brew install automake cmake doxygen libelf libusb libusb-compat wget xz
 else
 	echo "Go install MacPorts from http://www.macports.org/ or Homebrew from http://brew.sh/ first, then we can talk"
 fi
-

prepare-mac-os.sh

@@ -22,7 +22,8 @@ cd build-psp
 CFLAGS="$CFLAGS -I/opt/local/include" \
   CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
   LDFLAGS="$LDFLAGS -L/opt/local/lib" \
-  ../configure --prefix="$PSPDEV" --target="psp" --enable-install-libbfd --enable-plugins --disable-werror --with-system-zlib
+  ../configure --prefix="$PSPDEV" --target="psp" --enable-install-libbfd \
+  --enable-plugins --disable-werror --with-system-zlib
 
 # Compile and install. ( -r is required for building under osx )
 make -j $(num_cpus) clean

scripts/001-binutils.sh

@@ -35,7 +35,11 @@
  cd build-psp
 
  ## Configure the build.
- CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c" --enable-lto --with-newlib --without-headers --disable-libssp
+ CFLAGS="$CFLAGS -I/opt/local/include" \
+   CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
+   LDFLAGS="$LDFLAGS -L/opt/local/lib" \
+   ../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c" \
+   --enable-lto --with-newlib --without-headers --disable-libssp
 
  ## Compile and install.
  make -j $(num_cpus) clean

scripts/002-gcc-stage1.sh

@@ -14,7 +14,10 @@
  ./bootstrap
 
  ## Configure the build.
- CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ./configure --with-pspdev="$PSPDEV"
+ CFLAGS="$CFLAGS -I/opt/local/include" \
+   CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
+   LDFLAGS="$LDFLAGS -L/opt/local/lib" \
+   ./configure --with-pspdev="$PSPDEV"
 
  ## Build and install.
  make -j $(num_cpus) clean

scripts/003-pspsdk-stage1.sh

@@ -16,9 +16,7 @@ clone_git_repo github.com pspdev newlib newlib-1_20_0-PSP
 
  ## Configure the build.
  ../configure --prefix="$PSPDEV" --target="psp" \
-     --enable-newlib-iconv \
-     --enable-newlib-multithread \
-     --enable-newlib-mb \
+   --enable-newlib-iconv --enable-newlib-multithread --enable-newlib-mb
 
  ## Compile and install.
  make -j $(num_cpus) clean