diff options
| -rw-r--r-- | recipes/gcc/gcc-cross-initial_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross-intermediate_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross-sdk_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/gcc/gcc-svn.inc | 9 | ||||
| -rw-r--r-- | recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch | 30 |
6 files changed, 38 insertions, 9 deletions
diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb index 0650a81ecf..8356dd1fac 100644 --- a/recipes/gcc/gcc-cross-initial_svn.bb +++ b/recipes/gcc/gcc-cross-initial_svn.bb @@ -1,7 +1,7 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native mpc-native" +DEPENDS += "gmp-native mpfr-native libmpc-native" EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb index 93cd35730b..b816c8b81c 100644 --- a/recipes/gcc/gcc-cross-intermediate_svn.bb +++ b/recipes/gcc/gcc-cross-intermediate_svn.bb @@ -1,7 +1,7 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "mpc-native gmp-native mpfr-native" +DEPENDS += "libmpc-native gmp-native mpfr-native" EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 752266be5f..48d8a0d1ed 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -7,7 +7,7 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "mpc-native gmp-native mpfr-native" +DEPENDS += "libmpc-native gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index c8e75d1881..2d3c1368dc 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -4,7 +4,7 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -DEPENDS += "mpc-native" +DEPENDS += "libmpc-native" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index 0198a8ddd9..6134aa2eaf 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -1,15 +1,14 @@ DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" -SRCREV="155514" +SRCREV = "155514" require gcc-common.inc -DEPENDS = "mpfr gmp mpc" +DEPENDS = "mpfr gmp libmpc" -GCC_BASE ?= "4.5" -PV = "${GCC_BASE}+svnr${SRCREV}" -PR = "r0" +BINV = "4.5.0" +PV = "4.5+svnr${SRCPV}" FILESPATHPKG .= ":gcc-svn" diff --git a/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch b/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch new file mode 100644 index 0000000000..348c77006f --- /dev/null +++ b/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch @@ -0,0 +1,30 @@ +* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used + used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross + directory. + +Index: gcc-4.5+svnr155514/libgfortran/configure +=================================================================== +--- gcc-4.5+svnr155514.orig/libgfortran/configure 2009-12-29 22:02:01.000000000 -0800 ++++ gcc-4.5+svnr155514/libgfortran/configure 2009-12-30 08:12:40.889091657 -0800 +@@ -11655,7 +11655,7 @@ CC="$lt_save_CC" + + # We need gfortran to compile parts of the library + #AC_PROG_FC(gfortran) +-FC="$GFORTRAN" ++#FC="$GFORTRAN" + ac_ext=${ac_fc_srcext-f} + ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' + ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' +Index: gcc-4.5+svnr155514/libgfortran/configure.ac +=================================================================== +--- gcc-4.5+svnr155514.orig/libgfortran/configure.ac 2009-12-29 22:02:01.000000000 -0800 ++++ gcc-4.5+svnr155514/libgfortran/configure.ac 2009-12-30 08:12:13.453094218 -0800 +@@ -187,7 +187,7 @@ AC_SUBST(enable_static) + + # We need gfortran to compile parts of the library + #AC_PROG_FC(gfortran) +-FC="$GFORTRAN" ++#FC="$GFORTRAN" + AC_PROG_FC(gfortran) + + # extra LD Flags which are required for targets |