From cae2315266b704614fe1d7bdeef004ef67a01e8d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Dec 2013 00:49:12 +0000 Subject: bitbake.conf/native.bbclass: Use FC instead of F77 for fortran gcc tooling appears to be standardising around the FC variable naming. This patch changes the F77 namespace to FC instead and use the default gfortran compiler. If anyone needs the F77 variables or tools, those can still be made on a case by case basis. Also updates local.conf.sample.extended accordingly. (From OE-Core rev: ae8c17be2845eff2be8394a5d9a45e6aa321c33d) Signed-off-by: Richard Purdie --- meta-yocto/conf/local.conf.sample.extended | 7 +++---- meta/classes/native.bbclass | 2 +- meta/conf/bitbake.conf | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended index f85310e813..628f14dbb0 100644 --- a/meta-yocto/conf/local.conf.sample.extended +++ b/meta-yocto/conf/local.conf.sample.extended @@ -245,10 +245,9 @@ # Enabling FORTRAN # Note this is not officially supported and is just illustrated here to # show an example of how it can be done -FORTRAN_forcevariable = ",fortran" -RUNTIMETARGET_append_pn-gcc-runtime = " libquadmath libgfortran" -export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" -export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}" +# You'll also need your fortran recipe to depend on libgfortran +#FORTRAN_forcevariable = ",fortran" +#RUNTIMETARGET_append_pn-gcc-runtime = " libquadmath" # # Kernel image features diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 7c4e8c35c6..b2d85efd21 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -59,7 +59,7 @@ export CONFIG_SITE = "${COREBASE}/meta/site/native" # set the compiler as well. It could have been set to something else export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" +export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}" export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " export CCLD = "${CC}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bbb1df677e..386c935492 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -446,7 +446,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" export CCLD = "${CC}" @@ -462,7 +462,7 @@ PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" -export BUILD_F77 = "${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}" +export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" export BUILD_CPP = "${BUILD_PREFIX}cpp ${BUILD_CC_ARCH}" export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" -- cgit v1.2.3-54-g00ecf