gcc3-build.inc: allow JAVA to be overridable inside recipes using this .inc

gcc_4.1.1.bb: Remove use of gcc4-build.inc, document java and fortran bits a bit

diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 32e22e1..d156645 100644 (file)
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -11,11 +11,11 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 BINV ?= "${PV}"
 
 # gcj doesn't work on some architectures
-JAVA = ",java"
-JAVA_arm = ""
-JAVA_armeb = ""
-JAVA_mipsel = ""
-JAVA_sh3 = ""
+JAVA ?= ",java"
+JAVA_arm ?= ""
+JAVA_armeb ?= ""
+JAVA_mipsel ?= ""
+JAVA_sh3 ?= ""
 # gcc4-build sets this to f95
 FORTRAN ?= "f77"
 LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}"

diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 6e332dc..e29f5e5 100644 (file)
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -29,11 +29,16 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
-EXTRA_OECONF += "--disable-libssp"
-
-FORTRAN = ""
-HAS_GFORTRAN = ""
+#Set the fortran bits
+FORTRAN = "" # "f95"
+HAS_GFORTRAN ?= "no"
 HAS_G2C = "no"
 
+#Set the java bits
+JAVA_arm = "" # ",java" 
+
+include gcc3-build.inc
+
+
+EXTRA_OECONF += "--disable-libssp"