diff options
| author |   Koen Kooi <koen@openembedded.org> | 2006-07-21 09:34:45 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-07-21 09:34:45 +0000 |
| commit | 6bf799da7ae6844c2f7beecbd4b014fd491f6ead (patch) | |
| tree | 6773d7752b852bd99c58a15c63e2f1108d78b1a8 | |
| parent | d9920589188dd1a7de339d410aa696f040e6a6d1 (diff) | |
| download | openembedded-6bf799da7ae6844c2f7beecbd4b014fd491f6ead.tar.gz | |
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
| -rw-r--r-- | packages/gcc/gcc3-build.inc | 10 | ||||
| -rw-r--r-- | packages/gcc/gcc_4.1.1.bb | 17 |
2 files changed, 16 insertions, 11 deletions
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 32e22e16f8..d15664549e 100644 --- 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 6e332dceca..e29f5e5b31 100644 --- 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" |