diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2007-11-22 02:26:25 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2007-11-22 02:26:25 +0000 |
| commit | d86fddc630bb02a00954c2aa8d9b3813589cfb29 (patch) | |
| tree | 33670073ad541d3df4a65bb7143122f73f6a76cd /packages/gcc | |
| parent | 4a281508a90b1bb52265aa9415c72de78c4ad964 (diff) | |
| parent | c29af7eb9dcd7cfa4e9769a94cb8153e5e432f4d (diff) | |
merge of '0c1bf31806b2e4fc83b4405655fc3b14a98915c5'
and '4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6'
Diffstat (limited to 'packages/gcc')
| -rw-r--r-- | packages/gcc/gcc-package.inc | 8 | ||||
| -rw-r--r-- | packages/gcc/gcc3-build.inc | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc_4.1.2.bb | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 82bf78db80..1eee631e33 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks \ g++ g++-symlinks \ cpp cpp-symlinks \ g77 g77-symlinks \ + gfortran gfortran-symlinks \ gcov gcov-symlinks \ libmudflap libmudflap-dev \ libstdc++ libg2c \ @@ -28,6 +29,11 @@ FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \ FILES_g77-symlinks = "${bindir}/g77 \ ${bindir}/f77" +FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951" +FILES_gfortran-symlinks = "${bindir}/gfortran \ + ${bindir}/f95" + FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \ ${base_libdir}/cpp" FILES_cpp-symlinks = "${bindir}/cpp" @@ -115,9 +121,11 @@ do_install () { # Symlinks so we can use these trivially on the target ln -sf ${TARGET_SYS}-g77 g77 + ln -sf ${TARGET_SYS}-gfortran gfortran ln -sf ${TARGET_SYS}-g++ g++ ln -sf ${TARGET_SYS}-gcc gcc ln -sf g77 f77 + ln -sf gfortran f95 ln -sf g++ c++ ln -sf gcc cc ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 2924f0f9dd..bb48f7b099 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -16,7 +16,7 @@ JAVA_arm ?= "" JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" -# gcc4-build sets this to f95 +# gcc4-build sets this to fortran FORTRAN ?= ",f77" LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index a6c99140b5..dcec68f0d6 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -42,6 +42,7 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits # ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" #Set the java bits JAVA = "" |