sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (b60d994e946c6460098488236d296984fe129efa)
- From: Sukneet Basuta <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (b60d994e946c6460098488236d296984fe129efa)
- Date: Mon, 30 Apr 2012 17:54:45 -0500
GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:
gnu/gcc/DEPENDS | 1
gnu/gcc/DETAILS | 60
+++++++++++++++++++++++++++++++++++--
gnu/gcc/HISTORY | 7 ----
gnu/gcc/PRE_BUILD | 29 +++++++++++++++++
gnu/gcc/gcc-4.4.0-ffast-math.patch | 50 ++++++++++++++++++++++++++++++
gnu/gcc/remove-libffi.patch | 50 ++++++++++++++++++++++++++++++
6 files changed, 186 insertions(+), 11 deletions(-)
New commits:
commit b60d994e946c6460098488236d296984fe129efa
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
Revert "Revert "Revert "gcc: => 4.7.0"""
This reverts commit 793d2fd6b6c8002138c82fbcc4edd64e71d2d224.
Didn't mean to commit this
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index fdd144a..988794f 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,5 +1,4 @@
. $GRIMOIRE/libcompat &&
-depends perl &&
if list_find "$GCC_COMPILER" "java" ; then
depends unzip &&
depends zip &&
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 6341e48..6e234e5 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,8 +1,8 @@
SPELL=gcc
- VERSION=4.7.0
+ VERSION=4.6.3
PATCHLEVEL=0
BASE_SOURCE_URL="ftp://gcc.gnu.org/gnu/gcc/${SPELL}-${VERSION}";
- SOURCE=gcc-$VERSION.tar.bz2
+ SOURCE=gcc-core-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
@@ -11,7 +11,32 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+if list_find "$GCC_COMPILER" "c++" ; then
+ SOURCE3=gcc-g++-$VERSION.tar.bz2
+ SOURCE4=$SOURCE3.sig
+ SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE3
+ SOURCE3_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE3
+ SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
+ SOURCE3_GPG=gnu.gpg:$SOURCE4:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "objc" ; then
+ SOURCE5=gcc-objc-$VERSION.tar.bz2
+ SOURCE6=$SOURCE5.sig
+ SOURCE5_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE5
+ SOURCE5_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE5
+ SOURCE6_URL[0]=${SOURCE5_URL[0]}.sig
+ SOURCE5_GPG=gnu.gpg:$SOURCE6:UPSTREAM_KEY
+ SOURCE6_IGNORE=signature
+fi
if list_find "$GCC_COMPILER" "ada" ; then
+ SOURCE7=gcc-ada-$VERSION.tar.bz2
+ SOURCE8=$SOURCE7.sig
+ SOURCE7_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE7
+ SOURCE7_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE7
+ SOURCE8_URL[0]=${SOURCE7_URL[0]}.sig
+ SOURCE7_GPG=gnu.gpg:$SOURCE8:UPSTREAM_KEY
+ SOURCE8_IGNORE=signature
# howto generate the ada bootstraper
# step 1: make a backup of your existing gcc cache you'll lose things like
libstdc++
@@ -46,6 +71,37 @@ fi
SOURCE14_URL[0]=${SOURCE13_URL[0]}.sig
SOURCE14_IGNORE=signature
fi
+if list_find "$GCC_COMPILER" "java" ; then
+ SOURCE9=gcc-java-$VERSION.tar.bz2
+ SOURCE10=$SOURCE9.sig
+ SOURCE9_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE9
+ SOURCE9_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE9
+ SOURCE10_URL[0]=${SOURCE9_URL[0]}.sig
+ SOURCE9_GPG=gnu.gpg:$SOURCE10:UPSTREAM_KEY
+ SOURCE10_IGNORE=signature
+# Eclipse compiler for Java (needed since 4.3)
+ SOURCE15=ecj-4.3.jar
+ SOURCE15_URL[0]=ftp://sourceware.org/pub/java/$SOURCE15
+ SOURCE15_GPG=gurus.gpg:$SOURCE15.sig
+fi
+if list_find "$GCC_COMPILER" "fortran" ; then
+ SOURCE11=gcc-fortran-$VERSION.tar.bz2
+ SOURCE12=$SOURCE11.sig
+ SOURCE11_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE11
+ SOURCE11_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE11
+ SOURCE12_URL[0]=${SOURCE11_URL[0]}.sig
+ SOURCE11_GPG=gnu.gpg:$SOURCE12:UPSTREAM_KEY
+ SOURCE12_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "go" ; then
+ SOURCE16=gcc-go-$VERSION.tar.bz2
+ SOURCE17=$SOURCE16.sig
+ SOURCE16_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE16
+ SOURCE16_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE16
+ SOURCE17_URL[0]=${SOURCE16_URL[0]}.sig
+ SOURCE16_GPG=gnu.gpg:$SOURCE17:UPSTREAM_KEY
+ SOURCE17_IGNORE=signature
+fi
LICENSE[0]=GPL
TMPFS=off
WEB_SITE=http://gcc.gnu.org/
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index e9894f0..ab42c03 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,10 +1,3 @@
-2012-03-22 Treeve Jelbert <treeve01 AT oi.be>
- * DETAILS: version 4.7.0
- there is now one integrated tarball, so remove multiple source files
- * PRE_BUILD: no need to unpack multiple files, except for ada
- do not apply ffast-math.patch or remove-libffi.patch
- * DEPENDS: add perl
-
2012-03-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.3
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 236aae2..47e5bf2 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,5 +1,15 @@
default_pre_build &&
+if list_find "$GCC_COMPILER" "c++" ; then
+ cd $BUILD_DIRECTORY &&
+ unpack_file 3
+fi &&
+if list_find "$GCC_COMPILER" "objc" ; then
+ cd $BUILD_DIRECTORY &&
+ unpack_file 5
+fi &&
if list_find "$GCC_COMPILER" "ada" ; then
+ cd $BUILD_DIRECTORY &&
+ unpack_file 7
cd $SOURCE_DIRECTORY &&
mkdir ${SOURCE13/.tar.bz2} &&
@@ -27,6 +37,21 @@ if list_find "$GCC_COMPILER" "ada" ; then
# End Ada bootstrap cache code
#
fi &&
+if list_find "$GCC_COMPILER" "java" ; then
+ cd $BUILD_DIRECTORY &&
+ unpack_file 9 &&
+ verify_file 15 &&
+
+ cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
+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
+fi &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&
@@ -34,4 +59,6 @@ cd $SOURCE_DIRECTORY &&
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
-patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch"
+patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/remove-libffi.patch"
diff --git a/gnu/gcc/gcc-4.4.0-ffast-math.patch
b/gnu/gcc/gcc-4.4.0-ffast-math.patch
new file mode 100644
index 0000000..7cfd00c
--- /dev/null
+++ b/gnu/gcc/gcc-4.4.0-ffast-math.patch
@@ -0,0 +1,50 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/crtfastmath.c
gcc-4.4.0/gcc/config/i386/crtfastmath.c
+--- gcc-4.4.0.orig/gcc/config/i386/crtfastmath.c 2009-05-12
16:27:42.827645459 -0700
++++ gcc-4.4.0/gcc/config/i386/crtfastmath.c 2009-05-12 16:27:50.489399823
-0700
+@@ -30,6 +30,23 @@
+ #include "cpuid.h"
+ #endif
+
++struct
++{
++ unsigned short int cwd;
++ unsigned short int swd;
++ unsigned short int twd;
++ unsigned short int fop;
++ long int fip;
++ long int fcs;
++ long int foo;
++ long int fos;
++ long int mxcsr;
++ long int mxcsr_mask;
++ long int st_space[32];
++ long int xmm_space[32];
++ long int padding[56];
++} __attribute__ ((aligned (16))) fxsave;
++
+ static void __attribute__((constructor))
+ #ifndef __x86_64__
+ /* The i386 ABI only requires 4-byte stack alignment, so this is necessary
+@@ -54,22 +71,6 @@
+ if (edx & bit_FXSAVE)
+ {
+ /* Check if DAZ is available. */
+- struct
+- {
+- unsigned short int cwd;
+- unsigned short int swd;
+- unsigned short int twd;
+- unsigned short int fop;
+- long int fip;
+- long int fcs;
+- long int foo;
+- long int fos;
+- long int mxcsr;
+- long int mxcsr_mask;
+- long int st_space[32];
+- long int xmm_space[32];
+- long int padding[56];
+- } __attribute__ ((aligned (16))) fxsave;
+
+ __builtin_memset (&fxsave, 0, sizeof (fxsave));
+
diff --git a/gnu/gcc/remove-libffi.patch b/gnu/gcc/remove-libffi.patch
new file mode 100644
index 0000000..91f2d15
--- /dev/null
+++ b/gnu/gcc/remove-libffi.patch
@@ -0,0 +1,50 @@
+--- gcc-4.6.2/Makefile.in.orig 2012-02-04 22:17:43.000000000 +0100
++++ gcc-4.6.2/Makefile.in 2012-02-04 22:19:31.000000000 +0100
+@@ -1848,7 +1848,6 @@
+ install-info-target: maybe-install-info-target-libgloss
+ install-info-target: maybe-install-info-target-gperf
+ install-info-target: maybe-install-info-target-examples
+-install-info-target: maybe-install-info-target-libffi
+ install-info-target: maybe-install-info-target-libjava
+ install-info-target: maybe-install-info-target-zlib
+ install-info-target: maybe-install-info-target-boehm-gc
+@@ -1963,7 +1962,6 @@
+ install-pdf-target: maybe-install-pdf-target-libgloss
+ install-pdf-target: maybe-install-pdf-target-gperf
+ install-pdf-target: maybe-install-pdf-target-examples
+-install-pdf-target: maybe-install-pdf-target-libffi
+ install-pdf-target: maybe-install-pdf-target-libjava
+ install-pdf-target: maybe-install-pdf-target-zlib
+ install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -2078,7 +2076,6 @@
+ install-html-target: maybe-install-html-target-libgloss
+ install-html-target: maybe-install-html-target-gperf
+ install-html-target: maybe-install-html-target-examples
+-install-html-target: maybe-install-html-target-libffi
+ install-html-target: maybe-install-html-target-libjava
+ install-html-target: maybe-install-html-target-zlib
+ install-html-target: maybe-install-html-target-boehm-gc
+@@ -2193,7 +2190,6 @@
+ installcheck-target: maybe-installcheck-target-libgloss
+ installcheck-target: maybe-installcheck-target-gperf
+ installcheck-target: maybe-installcheck-target-examples
+-installcheck-target: maybe-installcheck-target-libffi
+ installcheck-target: maybe-installcheck-target-libjava
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -3045,7 +3041,6 @@
+ maybe-install-target-libgloss \
+ maybe-install-target-gperf \
+ maybe-install-target-examples \
+- maybe-install-target-libffi \
+ maybe-install-target-libjava \
+ maybe-install-target-zlib \
+ maybe-install-target-boehm-gc \
+@@ -3179,7 +3174,6 @@
+ maybe-install-strip-target-libgloss \
+ maybe-install-strip-target-gperf \
+ maybe-install-strip-target-examples \
+- maybe-install-strip-target-libffi \
+ maybe-install-strip-target-libjava \
+ maybe-install-strip-target-zlib \
+ maybe-install-strip-target-boehm-gc \
- [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (b60d994e946c6460098488236d296984fe129efa), Sukneet Basuta, 04/30/2012
Archive powered by MHonArc 2.6.24.