New commits:
commit f864087dde79554dea73889c80112dc2d844a678
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gcc: Remove unpacking of go and fortran, tarballs long gone
commit 3a7b9f524a9c7cec506ac6c60173a7f04c8bbc63
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gcc: Remove classpath-ft2include.patch, applied by upstream
commit 8c7f5d2b564cdd31bfa97bfd8b6b052aa905aac5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gcc: Removed bogus line in PRE_BUILD
commit 9382bdf6d5cd6eddccb9cec7bbe25408df816c4f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gcc: Simplify ada binary selection
commit b760fdb32e245d1e5b0791cdd7c890f23840fb7e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
gtklick: bump to 0.6.4
commit e0f9979146b2370b9fe0ec63cbb10b85c31f2efb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
klick: bump to 0.12.2
commit a6c3d0e2ef1c9bb28dfd64abdccd1d10e0331aea
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gcc: => 4.9.0
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 2331a8f..216e5c8 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -45,19 +45,11 @@ if list_find "$GCC_COMPILER" "ada" ; then
# step 10: restore your old gcc cache and resurrect it
#
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
- VERSION13=4.7.1
- SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
- VERSION13=4.9.1
- SOURCE13=ada-$VERSION13-x86_64-pc-linux-gnu.tar.bz2
-else
- VERSION13=4.7.1
- SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
-
-fi
+ case "${SMGL_COMPAT_ARCHS[1]}" in
+ x86_64) VERSION13=4.9.1 ARCH13=x86_64 ;;
+ *) VERSION13=4.7.1 ARCH13=i686 ;;
+ esac
+ SOURCE13=ada-$VERSION13-$ARCH13-pc-linux-gnu.tar.bz2
SOURCE13_URL[0]=http://download.sourcemage.org/distro/$SOURCE13
SOURCE13_GPG="gurus.gpg:$SOURCE13.sig:VERIFIED_UPSTREAM_KEY"
SOURCE14=$SOURCE13.sig
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index c5b5c58..1ea51a2 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,9 @@
+2015-01-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Simplified ada binary selection
+ * PRE_BUILD: Removed bogus line
+ * classpath-ft2include.patch, PRE_BUILD: Removed, applied by upstream
+ * PRE_BUILD: Removed unpacking of go and fortran, tarballs long gone
+
2014-11-15 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: patch for freetype2 headers
* classpath-ft2include.patch: added said patch
@@ -39,6 +45,9 @@
2014-04-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.9.0
+2014-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.9.0
+
2013-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.8.2
* PRE_BUILD, 0001-remove-libffi.patch: add patch to remove
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 96699ab..3e69cdb 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -32,20 +32,7 @@ if [[ "$GCC_CLOOG" == "y" ]]; then
fi
if list_find "$GCC_COMPILER" "java"; then
- cp ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
- cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar &&
-
- # Freetype moved headers - Yay!
- cd "$SOURCE_DIRECTORY" &&
- patch -Np1 < "$SCRIPT_DIRECTORY/classpath-ft2include.patch"
-fi &&
-if list_find "$GCC_COMPILER" "fortran" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 11
-fi &&
-if list_find "$GCC_COMPILER" "go" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 16
+ cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
fi &&