gcc: version bumped to 4.9.1

lunar-linux · Sep 7, 2014 · e9169e0 · e9169e0
1 parent c3666d6
commit e9169e0
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 34 deletions.
diff --git a/compilers/gcc/BUILD b/compilers/gcc/BUILD
@@ -1,11 +1,3 @@
-# move libstdc++.so.*-gdb.py to libexec dir
-patch_it $SOURCE2 1 &&
-
-# installwatch fails to track files installed using tar
-sedit 's;^\(build_install_headers_dir=\).*;\1install-headers-cp;' gcc/config.build &&
-
-# We use libiberty.a from binutils instead
-sedit 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in  &&
 
 #sedit 's/trap 0/trap "" 0/' configure  &&
 
@@ -21,12 +13,14 @@ LANGUAGES="${LANGUAGES:=c++}"  &&
              --infodir=${MODULE_PREFIX}/share/info  \
              --mandir=${MODULE_PREFIX}/share/man    \
              --enable-__cxa_atexit                  \
-             --enable-threads                       \
+             --enable-threads=posix                 \
              --disable-nls                          \
              --enable-target-optspace               \
              --with-gnu-ld                          \
              --with-system-zlib                     \
              --enable-shared                        \
+             --disable-multilib                     \
+             --disable-werror                       \
              $OPTS                                 &&
 
 make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&

diff --git a/compilers/gcc/DETAILS b/compilers/gcc/DETAILS
@@ -1,16 +1,19 @@
           MODULE=gcc
-         VERSION=4.8.3
+         VERSION=4.9.1
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-4.5.0-python.patch.bz2
+         SOURCE3=gcc-4.8-filename-output.patch
    SOURCE_URL[0]=$GNU_URL/gcc/$MODULE-$VERSION
    SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION
    SOURCE_URL[2]=http://www.online-mirror.org/gcc/$MODULE-$VERSION
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha256:6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e
-     SOURCE2_VFY=sha1:7c1fc0b526b74cce301b85acee04011ed6e5aa5a
-        WEB_SITE=http://gcc.gnu.org
+     SOURCE3_URL=$PATCH_URL
+      SOURCE_VFY=sha256:d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+     SOURCE2_VFY=sha256:b27a75a9906e104c050fb28fb7e318661b4a5a8e9b25138bf7c8863664da5d44
+     SOURCE3_VFY=sha256:9278e745190bac0b3f6ef74972aecd4e2891d4930f7b6fa8840c3d4f7fbf4f98
+        WEB_SITE=http://gcc.gnu.org/
          ENTERED=20020628
-         UPDATED=20140714
+         UPDATED=20140907
            SHORT="GNU compiler collection"
 
 cat << EOF

diff --git a/compilers/gcc/PRE_BUILD b/compilers/gcc/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+
+# move libstdc++.so.*-gdb.py to libexec dir
+patch_it $SOURCE2 1 &&
+
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
+patch_it $SOURCE3 0 &&
+
+# installwatch fails to track files installed using tar
+sedit 's;^\(build_install_headers_dir=\).*;\1install-headers-cp;' gcc/config.build &&
+
+# We use libiberty.a from binutils instead
+sedit 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
diff --git a/compilers/gcc/PRE_BUILD.x86_64 b/compilers/gcc/PRE_BUILD.x86_64
diff --git a/...lers/gcc/plugin.d/optimize-gcc_4_8.plugin → ...lers/gcc/plugin.d/optimize-gcc_4_9.plugin b/...lers/gcc/plugin.d/optimize-gcc_4_8.plugin → ...lers/gcc/plugin.d/optimize-gcc_4_9.plugin
@@ -1,5 +1,5 @@
 #
-# gcc-4.8.x compiler optimizations plugin
+# gcc-4.9.x compiler optimizations plugin
 #
 
 compiler_gcc_optimize_defaults()
@@ -10,18 +10,18 @@ compiler_gcc_optimize_defaults()
   CPU=$(arch | sed 's;_;-;')
 }
 
-plugin_compiler_gcc_4_8_optimize()
+plugin_compiler_gcc_4_9_optimize()
 {
-  if [ "${LUNAR_COMPILER:-GCC_4_8}" != "GCC_4_8" ]; then
+  if [ "${LUNAR_COMPILER:-GCC_4_9}" != "GCC_4_9" ]; then
     return 2
   fi
 
-  debug_msg "plugin_compiler_gcc_4_8_optimize($@)"
+  debug_msg "plugin_compiler_gcc_4_9_optimize($@)"
 
   compiler_gcc_optimize_defaults
 
-  if [ -f /etc/lunar/local/optimizations.GCC_4_8 ]; then
-    . /etc/lunar/local/optimizations.GCC_4_8
+  if [ -f /etc/lunar/local/optimizations.GCC_4_9 ]; then
+    . /etc/lunar/local/optimizations.GCC_4_9
   fi
 
   # some local macro's
@@ -170,17 +170,17 @@ plugin_compiler_gcc_4_8_optimize()
 }
 
 
-plugin_compiler_gcc_4_8_menu()
+plugin_compiler_gcc_4_9_menu()
 {
   # The main code calls this function WITHOUT $1 to find out which
   # compiler optimization plugins exist. It then returns the plugin
   # identifier which can be saved in $LUNAR_COMPILER as the user's
   # choice for COMPILERS
   if [ -z "$1" ]; then
-    echo "GCC_4_8"
-    echo "GNU C Compiler suite version 4.8.x"
+    echo "GCC_4_9"
+    echo "GNU C Compiler suite version 4.9.x"
     return 2
-  elif [ "$1" != "GCC_4_8" ]; then
+  elif [ "$1" != "GCC_4_9" ]; then
     # we don't display anything when the user selected a
     # different menu
     return 2
@@ -209,7 +209,7 @@ plugin_compiler_gcc_4_8_menu()
   save_optimizations()
   {
     debug_msg "save_optimizations($@)"
-    cat >/etc/lunar/local/optimizations.GCC_4_8  <<EOF
+    cat >/etc/lunar/local/optimizations.GCC_4_9  <<EOF
 CPU=$CPU
 CPUTUNE=$CPUTUNE
 BOPT=$BOPT
@@ -223,8 +223,8 @@ EOF
 
   compiler_gcc_optimize_defaults
 
-  if [ -f /etc/lunar/local/optimizations.GCC_4_8 ]; then
-    . /etc/lunar/local/optimizations.GCC_4_8
+  if [ -f /etc/lunar/local/optimizations.GCC_4_9 ]; then
+    . /etc/lunar/local/optimizations.GCC_4_9
   fi
 
   export IFS=$'\t\n'
@@ -234,7 +234,7 @@ EOF
 
   while true; do
     unset OPTIONS
-    IS_DEFAULT=$([ "$(get_local_config LUNAR_COMPILER)" == "GCC_4_8" ] && echo DEFAULT || get_local_config LUNAR_COMPILER)
+    IS_DEFAULT=$([ "$(get_local_config LUNAR_COMPILER)" == "GCC_4_9" ] && echo DEFAULT || get_local_config LUNAR_COMPILER)
     DEFAULT=${CHOICE:-safe}
     CHOICE=`$DIALOG --title "$TITLE" --ok-label "Select" --cancel-label "Close" --default-item "$DEFAULT" --item-help --menu "" 0 0 0 $(
       echo "default"
@@ -286,8 +286,8 @@ EOF
       case $CHOICE in
         default)
           if [ "$IS_DEFAULT" != "DEFAULT" ]; then
-            set_local_config LUNAR_COMPILER GCC_4_8
-            $DIALOG --msgbox "Gcc 4.8 is now the default compiler!" 6 60
+            set_local_config LUNAR_COMPILER GCC_4_9
+            $DIALOG --msgbox "Gcc 4.9 is now the default compiler!" 6 60
           fi
           ;;
         safe)
@@ -678,5 +678,5 @@ EOF
 }
 
 
-plugin_register BUILD_BUILD plugin_compiler_gcc_4_8_optimize
-plugin_register OPTIMIZE_MENU plugin_compiler_gcc_4_8_menu
+plugin_register BUILD_BUILD plugin_compiler_gcc_4_9_optimize
+plugin_register OPTIMIZE_MENU plugin_compiler_gcc_4_9_menu