From 0dfc8aabef0fe17bf9c920c30d2ea94fd926cc9d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Aug 2013 09:43:59 +0000 Subject: gcc-target: Combine gcc-target-configure.inc, gcc-target-package.inc and other common code (From OE-Core rev: 86bbe5b7b8e8f0c6ee88888fa083053ae14765c4) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-configure-target.inc | 8 -- meta/recipes-devtools/gcc/gcc-package-target.inc | 142 ------------------- meta/recipes-devtools/gcc/gcc-target.inc | 153 +++++++++++++++++++++ meta/recipes-devtools/gcc/gcc_4.7.bb | 5 +- meta/recipes-devtools/gcc/gcc_4.8.bb | 5 +- 5 files changed, 155 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-target.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-target.inc create mode 100644 meta/recipes-devtools/gcc/gcc-target.inc (limited to 'meta/recipes-devtools/gcc') diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc deleted file mode 100644 index 5f608d6bdf..0000000000 --- a/meta/recipes-devtools/gcc/gcc-configure-target.inc +++ /dev/null @@ -1,8 +0,0 @@ -GCCMULTILIB = "--enable-multilib" -require gcc-configure-common.inc - -EXTRA_OECONF_PATHS = " \ - --with-sysroot=/ \ - --with-build-sysroot=${STAGING_DIR_TARGET} \ - --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ - --with-gxx-include-dir=${includedir}/c++/ --enable-dependency-tracking" diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc deleted file mode 100644 index 95a92c1f91..0000000000 --- a/meta/recipes-devtools/gcc/gcc-package-target.inc +++ /dev/null @@ -1,142 +0,0 @@ -PACKAGES = "\ - ${PN} ${PN}-plugins ${PN}-symlinks \ - g++ g++-symlinks \ - cpp cpp-symlinks \ - g77 g77-symlinks \ - gfortran gfortran-symlinks \ - gcov gcov-symlinks \ - ${PN}-plugin-dev \ - ${PN}-doc \ - ${PN}-dev \ - ${PN}-dbg \ -" - -FILES_${PN} = "\ - ${bindir}/${TARGET_PREFIX}gcc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ -" -INSANE_SKIP_${PN} += "dev-so" - -FILES_${PN}-dbg += "\ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \ -" -FILES_${PN}-dev = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ -" -FILES_${PN}-plugin-dev = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ -" -FILES_${PN}-symlinks = "\ - ${bindir}/cc \ - ${bindir}/gcc \ - ${bindir}/gccbug \ -" - -FILES_${PN}-plugins = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ -" -ALLOW_EMPTY_${PN}-plugins = "1" - -FILES_g77 = "\ - ${bindir}/${TARGET_PREFIX}g77 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ -" -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 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "${bindir}/cpp" - -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" -FILES_gcov-symlinks = "${bindir}/gcov" - -FILES_g++ = "\ - ${bindir}/${TARGET_PREFIX}g++ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ -" -FILES_g++-symlinks = "\ - ${bindir}/c++ \ - ${bindir}/g++ \ -" - - -FILES_${PN}-doc = "\ - ${infodir} \ - ${mandir} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ -" - -do_install () { - oe_runmake 'DESTDIR=${D}' install-host - - # Cleanup some of the ${libdir}{,exec}/gcc stuff ... - rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la - rmdir ${D}${includedir} - - # Hack around specs file assumptions - test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs - - # Cleanup manpages.. - rm -rf ${D}${mandir}/man7 - - cd ${D}${bindir} - - # We care about g++ not c++ - rm -f *c++ - - # We don't care about the gcc- ones for this - rm -f *gcc-?.?* - - # We use libiberty from binutils - find ${D}${libdir} -name libiberty.a | xargs rm -f - find ${D}${libdir} -name libiberty.h | xargs rm -f - - # Not sure why we end up with these but we don't want them... - rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* - - # Symlinks so we can use these trivially on the target - if [ -e ${TARGET_PREFIX}g77 ]; then - ln -sf ${TARGET_PREFIX}g77 g77 || true - ln -sf g77 f77 || true - fi - if [ -e ${TARGET_PREFIX}gfortran ]; then - ln -sf ${TARGET_PREFIX}gfortran gfortran || true - ln -sf gfortran f95 || true - fi - ln -sf ${TARGET_PREFIX}g++ g++ - ln -sf ${TARGET_PREFIX}gcc gcc - ln -sf ${TARGET_PREFIX}cpp cpp - install -d ${D}${base_libdir} - ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${base_libdir}/cpp - ln -sf g++ c++ - ln -sf gcc cc - - chown -R root:root ${D} -} diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc new file mode 100644 index 0000000000..150fbba419 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -0,0 +1,153 @@ +GCCMULTILIB = "--enable-multilib" +require gcc-configure-common.inc + +EXTRA_OECONF_PATHS = " \ + --with-sysroot=/ \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ + --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ + --with-gxx-include-dir=${includedir}/c++/ --enable-dependency-tracking" + +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR} -I${B}/gcc/include/ " + +PACKAGES = "\ + ${PN} ${PN}-plugins ${PN}-symlinks \ + g++ g++-symlinks \ + cpp cpp-symlinks \ + g77 g77-symlinks \ + gfortran gfortran-symlinks \ + gcov gcov-symlinks \ + ${PN}-plugin-dev \ + ${PN}-doc \ + ${PN}-dev \ + ${PN}-dbg \ +" + +FILES_${PN} = "\ + ${bindir}/${TARGET_PREFIX}gcc* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ +" +INSANE_SKIP_${PN} += "dev-so" + +FILES_${PN}-dbg += "\ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \ +" +FILES_${PN}-dev = "\ + ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ +" +FILES_${PN}-plugin-dev = "\ + ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ +" +FILES_${PN}-symlinks = "\ + ${bindir}/cc \ + ${bindir}/gcc \ + ${bindir}/gccbug \ +" + +FILES_${PN}-plugins = "\ + ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ +" +ALLOW_EMPTY_${PN}-plugins = "1" + +FILES_g77 = "\ + ${bindir}/${TARGET_PREFIX}g77 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ +" +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 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" +FILES_cpp-symlinks = "${bindir}/cpp" + +FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" +FILES_gcov-symlinks = "${bindir}/gcov" + +FILES_g++ = "\ + ${bindir}/${TARGET_PREFIX}g++ \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ +" +FILES_g++-symlinks = "\ + ${bindir}/c++ \ + ${bindir}/g++ \ +" + + +FILES_${PN}-doc = "\ + ${infodir} \ + ${mandir} \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ +" + +do_install () { + oe_runmake 'DESTDIR=${D}' install-host + + # Cleanup some of the ${libdir}{,exec}/gcc stuff ... + rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools + rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools + rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la + rmdir ${D}${includedir} + + # Hack around specs file assumptions + test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs + + # Cleanup manpages.. + rm -rf ${D}${mandir}/man7 + + cd ${D}${bindir} + + # We care about g++ not c++ + rm -f *c++ + + # We don't care about the gcc- ones for this + rm -f *gcc-?.?* + + # We use libiberty from binutils + find ${D}${libdir} -name libiberty.a | xargs rm -f + find ${D}${libdir} -name libiberty.h | xargs rm -f + + # Not sure why we end up with these but we don't want them... + rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* + + # Symlinks so we can use these trivially on the target + if [ -e ${TARGET_PREFIX}g77 ]; then + ln -sf ${TARGET_PREFIX}g77 g77 || true + ln -sf g77 f77 || true + fi + if [ -e ${TARGET_PREFIX}gfortran ]; then + ln -sf ${TARGET_PREFIX}gfortran gfortran || true + ln -sf gfortran f95 || true + fi + ln -sf ${TARGET_PREFIX}g++ g++ + ln -sf ${TARGET_PREFIX}gcc gcc + ln -sf ${TARGET_PREFIX}cpp cpp + install -d ${D}${base_libdir} + ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${base_libdir}/cpp + ln -sf g++ c++ + ln -sf gcc cc + + chown -R root:root ${D} +} diff --git a/meta/recipes-devtools/gcc/gcc_4.7.bb b/meta/recipes-devtools/gcc/gcc_4.7.bb index f68c67a403..0ae22e8fa3 100644 --- a/meta/recipes-devtools/gcc/gcc_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc_4.7.bb @@ -1,5 +1,2 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-configure-target.inc -require gcc-package-target.inc - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR} -I${B}/gcc/include/ " +require gcc-target.inc diff --git a/meta/recipes-devtools/gcc/gcc_4.8.bb b/meta/recipes-devtools/gcc/gcc_4.8.bb index f68c67a403..0ae22e8fa3 100644 --- a/meta/recipes-devtools/gcc/gcc_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc_4.8.bb @@ -1,5 +1,2 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-configure-target.inc -require gcc-package-target.inc - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR} -I${B}/gcc/include/ " +require gcc-target.inc -- cgit v1.2.3-54-g00ecf