[Lunar-commits] <moonbase> gcc: 4.4.1

[Samuel Verstraete]

commit 0b0ff67b579fe2e751095c5ca374167b09429248
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Wed Aug 5 14:45:34 2009 +0200

    gcc: 4.4.1
---
 compilers/gcc/BUILD        |   15 ++++++---------
 compilers/gcc/BUILD.x86_64 |   13 +++++--------
 compilers/gcc/CONFIGURE    |   12 ++++++------
 compilers/gcc/DEPENDS      |    3 ++-
 compilers/gcc/DETAILS      |    6 +++---
 compilers/gcc/POST_INSTALL |   14 ++++----------
 6 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/compilers/gcc/BUILD b/compilers/gcc/BUILD
index fe306a7..7fcc411 100644
--- a/compilers/gcc/BUILD
+++ b/compilers/gcc/BUILD
@@ -3,17 +3,14 @@
   mkdir BUILD  &&
   cd BUILD     &&
 
-  sedit 's/trap 0/trap "" 0/' ../configure  &&
+  #sedit 's/trap 0/trap "" 0/' ../configure  &&
   # We use libiberty.a from binutils instead
-  sedit 's/install_to_$(INSTALL_DEST) //' ../libiberty/Makefile.in &&
+  sedit 's/install_to_$(INSTALL_DEST) //' ../libiberty/Makefile.in  &&
 
-  LANGUAGES="${LANGUAGES:=c++}" &&
+  LANGUAGES="${LANGUAGES:=c++}"  &&
 
-  if in_depends gcc mpfr ; then
-    LANGUAGES="${LANGUAGES},fortran"
-  fi
-
-  ../configure --host=$BUILD                          \
+  ../configure --build=$BUILD                         \
+               --host=$BUILD                          \
                --enable-languages=$LANGUAGES          \
                --prefix=${MODULE_PREFIX}              \
                --infodir=${MODULE_PREFIX}/share/info  \
@@ -25,7 +22,7 @@
                --with-gnu-ld                          \
                --with-system-zlib                     \
                --enable-shared                        \
-               $OPTS &&
+               $OPTS                                 &&
 
   make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
   prepare_install  && 
diff --git a/compilers/gcc/BUILD.x86_64 b/compilers/gcc/BUILD.x86_64
index 34a04f7..6ed319d 100644
--- a/compilers/gcc/BUILD.x86_64
+++ b/compilers/gcc/BUILD.x86_64
@@ -3,17 +3,14 @@
   mkdir BUILD  &&
   cd BUILD     &&
 
-  sedit 's/trap 0/trap "" 0/' ../configure  &&
+  #sedit 's/trap 0/trap "" 0/' ../configure  &&
   # We use libiberty.a from binutils instead
-  sedit 's/install_to_$(INSTALL_DEST) //' ../libiberty/Makefile.in &&
+  sedit 's/install_to_$(INSTALL_DEST) //' ../libiberty/Makefile.in  &&
 
-  LANGUAGES=${LANGUAGES:=c++} &&
-
-  if in_depends gcc mpfr ; then
-    LANGUAGES="${LANGUAGES},fortran"
-  fi
+  LANGUAGES=${LANGUAGES:=c++}  &&
 
   ../configure --host=$BUILD                          \
+               --build=$BUILD                         \
                --enable-languages=$LANGUAGES          \
                --prefix=${MODULE_PREFIX}              \
                --infodir=${MODULE_PREFIX}/share/info  \
@@ -26,7 +23,7 @@
                --with-system-zlib                     \
                --enable-shared                        \
                --disable-multilib                     \
-               $OPTS &&
+               $OPTS                                 &&
 
   make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
   prepare_install  && 
diff --git a/compilers/gcc/CONFIGURE b/compilers/gcc/CONFIGURE
index 176efa1..79b186a 100644
--- a/compilers/gcc/CONFIGURE
+++ b/compilers/gcc/CONFIGURE
@@ -9,12 +9,13 @@ if [ -n "$RECONFIGURE" ] ; then
     OPTIONS=(
       "java"    "Java"        "off"
       "objc"    "Objective C" "off"
+      "fortran" "Fortran"     "off"
     )
-    RESULT=`dialog --title "Select additional compiler languages"   \
-                   --stdout                                         \
-                   --separate-output                                \
-                   --checklist  "Available additional languages:"   \
-                    0 0 0                                           \
+    RESULT=`dialog --title "Select additional compiler languages"  \
+                   --stdout                                        \
+                   --separate-output                               \
+                   --checklist  "Available additional languages:"  \
+                    0 0 0                                          \
                    "${OPTIONS[@]}"`
 
     LANGUAGES="c++,$(echo $RESULT | sed 's/ /,/g')"
@@ -29,4 +30,3 @@ if [ -n "$RECONFIGURE" ] ; then
   fi
 
 fi
-
diff --git a/compilers/gcc/DEPENDS b/compilers/gcc/DEPENDS
index 858cf14..ae64c3c 100644
--- a/compilers/gcc/DEPENDS
+++ b/compilers/gcc/DEPENDS
@@ -1 +1,2 @@
-optional_depends "mpfr" "" "" "to compile fortran support"
+depends gmp
+depends mpfr
diff --git a/compilers/gcc/DETAILS b/compilers/gcc/DETAILS
index 91ae188..1174072 100644
--- a/compilers/gcc/DETAILS
+++ b/compilers/gcc/DETAILS
@@ -1,13 +1,13 @@
           MODULE=gcc
-         VERSION=4.2.4
+         VERSION=4.4.1
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=$GNU_URL/gcc/$MODULE-$VERSION
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/gcc/$MODULE-$VERSION
    SOURCE_URL[2]=http://www.online-mirror.org/gcc/$MODULE-$VERSION
-      SOURCE_VFY=sha1:bb20efc7750fe0d6172c5945572bf036fe59d3dd
+      SOURCE_VFY=sha1:9156ddb7e4cc72288ec31760d6ddc7981123a8a2
         WEB_SITE=http://gcc.gnu.org
          ENTERED=20020628
-         UPDATED=20080523
+         UPDATED=20090801
            PSAFE=no
            SHORT="GNU compiler collection"
 
diff --git a/compilers/gcc/POST_INSTALL b/compilers/gcc/POST_INSTALL
index c3e8185..6179464 100644
--- a/compilers/gcc/POST_INSTALL
+++ b/compilers/gcc/POST_INSTALL
@@ -1,14 +1,8 @@
-# allow seamless upgrade/downgrade from/to gcc <=> gcc3
-if module_installed gcc3 ; then
-  remove_module gcc3
-fi
-
-cd /usr/lib/gcc/$BUILD/$VERSION                          &&
-ln    -sf /usr/bin/cpp cpp                               &&
-cd /lib/                                                 &&
-ln    -sf /usr/bin/cpp cpp                               && 
+cd /usr/lib/gcc/$BUILD/$VERSION  &&
+ln    -sf /usr/bin/cpp cpp       &&
+cd /lib/                         &&
+ln    -sf /usr/bin/cpp cpp       && 
 
 if [ ! -e /usr/bin/cc ] ; then
   ln -s gcc /usr/bin/cc
 fi || true
-