Alejandro Mery:

package/base/gcc3/config-300.hlp

@@ -35,22 +35,13 @@ ROCKCFG_DEFAULT_CXX
 ROCKCFG_DEFAULT_F77
   The optiosn controls the default compiler Fortran-77 programs.
 
-MENU_PKG_GCC2
-  More options for gcc2.
-
-ROCKCFG_PKG_GCC2_STACKPRO
-  Please check here to use the Stack Smashing Protector for gcc2.
+ROCKCFG_PKG_GCC_STACKPRO
+  Please check here to use the GCC Stack Smashing Protector in all
+  gcc versions for which it is available.
   This will help to prevent buffer overflows.
   
 ROCKCFG_PKG_GCC2_NO_CHILL
   Please check here if you don't want to build the gcc2 CHILL compiler.
 
-MENU_PKG_GCC3
-  More options for gcc3.
-  
-ROCKCFG_PKG_GCC3_STACKPRO
-  Please check here to use the Stack Smashing Protector for gcc3.
-  This will help to prevent buffer overflows.
-
 ROCKCFG_PKG_GCC3_NO_JAVA
   Please check here if you don't want to build the gcc3 JAVA compiler.

package/base/gcc3/config-300.in

@@ -76,40 +76,48 @@ menu_begin MENU_COMPILER 'Selecting compiler'
 	choice ROCKCFG_DEFAULT_F77 $default $list
 menu_end
 
-if pkgcheck gcc2 X
-then
-	menu_begin MENU_PKG_GCC2 'GCC (GNU Compiler Collection) 2.x options'
-		bool 'Use GCC 2.x Stack-Smashing Protector' \
-					ROCKCFG_PKG_GCC2_STACKPRO 0
-		bool 'Do not build GCC 2.x CHILL compiler' \
-					ROCKCFG_PKG_GCC2_NO_CHILL 0
-	menu_end
+if pkgcheck gcc3 X && pkgcheck gcc33 X; then
+	comment ' '
+	comment 'WARNING: gcc3 and gcc33 are not designed to work together!!'
+	comment 'WARNING: please disable one of them.'
 fi
 
-if pkgcheck gcc3 X
-then
-	menu_begin MENU_PKG_GCC3 'GCC (GNU Compiler Collection) 3.x options'
-		bool 'Use GCC 3.x Stack-Smashing Protector' \
-					ROCKCFG_PKG_GCC3_STACKPRO 0
-		bool 'Do not build GCC 3.x JAVA compiler' \
-					ROCKCFG_PKG_GCC3_NO_JAVA 0
-	menu_end
-fi
+if pkgcheck "gcc2|gcc3|gcc33|gccx" X; then
 
-if pkgcheck gcc33 X
-then
-	menu_begin MENU_PKG_GCC33 'GCC (GNU Compiler Collection) 3.3 options'
-		bool 'Use GCC 3.3 Stack-Smashing Protector' \
-					ROCKCFG_PKG_GCC33_STACKPRO 0
-		bool 'Do not build GCC 3.3 JAVA compiler' \
+	menu_begin MENU_PKG_GCC 'GCC (GNU Compiler Collection) options'
+		bool 'Use Stack-Smashing Protector when available' \
+					ROCKCFG_PKG_GCC_STACKPRO 0
+		%include package/*/*/subconfig-gcc.in
+		
+		if pkgcheck gcc2 X; then
+			comment ' '
+			comment '--- GCC 2.x options'
+			bool 'Do not build CHILL compiler' \
+					ROCKCFG_PKG_GCC2_NO_CHILL 0
+			%include package/*/*/subconfig-gcc2.in
+		fi
+		if pkgcheck gcc3 X; then
+			comment ' '
+			comment '--- GCC 3.2.x options'
+			bool 'Do not build JAVA compiler' \
+					ROCKCFG_PKG_GCC3_NO_JAVA 0
+			%include package/*/*/subconfig-gcc3.in
+		fi
+		if pkgcheck gcc33 X; then
+			comment ' '
+			comment '--- GCC 3.3.x options'
+			bool 'Do not build JAVA compiler' \
 					ROCKCFG_PKG_GCC33_NO_JAVA 0
-	menu_end
-fi
-
-if pkgcheck gccx X
-then
-	menu_begin MENU_PKG_GCCX 'GCC (GNU Compiler Collection) snapshot options'
-		bool 'Do not build GCC-snapshot JAVA compiler' \
+			%include package/*/*/subconfig-gcc33.in
+		fi
+		if pkgcheck gccx X; then
+			comment ' '
+			comment '--- GCC-snapshot options'
+			bool 'Do not build JAVA compiler' \
 					ROCKCFG_PKG_GCCX_NO_JAVA 0
+			%include package/*/*/subconfig-gccx.in
+		fi
+
 	menu_end
 fi
+

package/base/gcc3/parse-config

@@ -25,13 +25,8 @@
 if [ $pkg != glibc23 -a $pkg != glibc22 -a \
      $pkg != grub  -a $pkg != dietlibc ]
 then
-	if [ "$ROCKCFG_PKG_GCC2_STACKPRO" = 1 ] ; then
+	if [ "${ROCKCFG_DEFAULT_CC:0:3}" = "gcc" -a "$ROCKCFG_PKG_GCC_STACKPRO" = 1 ] ; then
 		var_append GCC2_WRAPPER_INSERT " " "-fstack-protector"
-	fi
-	if [ "$ROCKCFG_DEFAULT_CC" = "gcc3" -a "$ROCKCFG_PKG_GCC3_STACKPRO" = 1 ] ; then
-		var_append GCC3_WRAPPER_INSERT " " "-fstack-protector"
-	fi
-	if [ "$ROCKCFG_DEFAULT_CC" = "gcc33" -a "$ROCKCFG_PKG_GCC33_STACKPRO" = 1 ] ; then
 		var_append GCC3_WRAPPER_INSERT " " "-fstack-protector"
 	fi
 fi