Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/04 20:57:43+01:00 reciva.com!pb
shuffle some gcc bits around

BKrev: 42a211a9UI3CnuzP7rPMH507ZQN9wg

diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 3e5510c..daf8c64 100644 (file)
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -10,11 +10,18 @@ S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 BINV ?= "${PV}"
 
+# gcj doesn't work on arm
+JAVA = ",java"
+JAVA_arm = ""
+# gcc4-build sets this to f95
+FORTRAN ?= "f77"
+LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}"
+
 EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
+                --enable-languages=${LANGUAGES} \
                 --enable-threads=posix \
                 --enable-multilib \
                 --enable-c99 \

diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc
new file mode 100644 (file)
index 0000000..e69de29