diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 09:50:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-23 16:20:13 +0100 |
commit | aa77ec7eef910635a5882aa83bbd96f13676d8d0 (patch) | |
tree | 16c56947a8bd1ce0935d405b236ea74612a6bcfa /meta/recipes-devtools/gcc | |
parent | 2eb9c1cc75a0f39390ddfcc3688fa4893fb77991 (diff) | |
download | ast2050-yocto-poky-aa77ec7eef910635a5882aa83bbd96f13676d8d0.zip ast2050-yocto-poky-aa77ec7eef910635a5882aa83bbd96f13676d8d0.tar.gz |
gcc-*-runtime.inc: Fold configuration into gcc-runtime.inc
(From OE-Core rev: 9cdfd55de8dbdea3d5e5ed25fbc67d1f198a069a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 64 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc (renamed from meta/recipes-devtools/gcc/gcc-package-runtime.inc) | 65 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime_4.7.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime_4.8.bb | 3 |
4 files changed, 67 insertions, 68 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc deleted file mode 100644 index 2ff8561..0000000 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ /dev/null @@ -1,64 +0,0 @@ -require gcc-configure-common.inc - -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" - -EXTRA_OECONF_PATHS = " \ - --with-gxx-include-dir=${includedir}/c++/ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET}" - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" - -EXTRA_OECONF += "--disable-libunwind-exceptions" -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" - -RUNTIMETARGET = "libssp libstdc++-v3 libgomp" -# ? -# libiberty -# libmudflap -# libgfortran - -do_configure () { - export CXX="${CXX} -nostdinc++ -nostdlib++" - mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} - for d in libgcc ${RUNTIMETARGET}; do - echo "Configuring $d" - rm -rf ${B}/$target/$d/ - mkdir -p ${B}/$target/$d/ - cd ${B}/$target/$d/ - chmod a+x ${S}/$d/configure - ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} - done -} - -do_compile () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in libgcc ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake MULTIBUILDTOP=${B}/$target/$d/ - done -} - -do_install () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install - done - rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir - if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude - fi - if [ -d ${D}${infodir} ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${infodir} - fi - chown -R root:root ${D} -} - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc" -PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 2e2f75a..b882889 100644 --- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -1,3 +1,68 @@ +require gcc-configure-common.inc + +CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" + +EXTRA_OECONF_PATHS = " \ + --with-gxx-include-dir=${includedir}/c++/ \ + --with-sysroot=${STAGING_DIR_TARGET} \ + --with-build-sysroot=${STAGING_DIR_TARGET}" + +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" + +EXTRA_OECONF += "--disable-libunwind-exceptions" +EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" + +RUNTIMETARGET = "libssp libstdc++-v3 libgomp" +# ? +# libiberty +# libmudflap +# libgfortran + +do_configure () { + export CXX="${CXX} -nostdinc++ -nostdlib++" + mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} + for d in libgcc ${RUNTIMETARGET}; do + echo "Configuring $d" + rm -rf ${B}/$target/$d/ + mkdir -p ${B}/$target/$d/ + cd ${B}/$target/$d/ + chmod a+x ${S}/$d/configure + ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} + done +} + +do_compile () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + for d in libgcc ${RUNTIMETARGET}; do + cd ${B}/$target/$d/ + oe_runmake MULTIBUILDTOP=${B}/$target/$d/ + done +} + +do_install () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + for d in ${RUNTIMETARGET}; do + cd ${B}/$target/$d/ + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install + done + rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir + if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then + rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude + fi + if [ -d ${D}${infodir} ]; then + rmdir --ignore-fail-on-non-empty -p ${D}${infodir} + fi + chown -R root:root ${D} +} + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc" +PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" + +BBCLASSEXTEND = "nativesdk" + PACKAGES = "\ ${PN}-dbg \ libstdc++ \ diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb index c16d27e..497d691 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb @@ -1,4 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-configure-runtime.inc -require gcc-package-runtime.inc +require gcc-runtime.inc diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb index c16d27e..497d691 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb @@ -1,4 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-configure-runtime.inc -require gcc-package-runtime.inc +require gcc-runtime.inc |