diff options
52 files changed, 101 insertions, 292 deletions
diff --git a/packages/gcc/gcc-3.3.3.inc b/packages/gcc/gcc-3.3.3.inc index ef8284c0e5..f0da44b3d8 100644 --- a/packages/gcc/gcc-3.3.3.inc +++ b/packages/gcc/gcc-3.3.3.inc @@ -37,56 +37,3 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-uclibc-3.3-200-code.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://bash3.patch;patch=1" - -MIRRORS_prepend () { -${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ -} - -S = "${WORKDIR}/gcc-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - -EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ - --with-gnu-ld \ - --enable-shared \ - --enable-multilib \ - --enable-target-optspace \ - --enable-languages=c,c++,f77 \ - --enable-threads=posix \ - --enable-c99 \ - --enable-long-long \ - --enable-symvers=gnu \ - --program-prefix=${TARGET_PREFIX} \ - ${EXTRA_OECONF_PATHS} \ - ${EXTRA_OECONF_DEP}" - -EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \ - --with-gxx-include-dir=${includedir}/c++/${PV}" - -EXTRA_OECONF_DEP = "" -EXTRA_OECONF_uclibc = "--disable-__cxa_atexit" -EXTRA_OECONF_glibc = "--enable-__cxa_atexit" -EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}" - -python __anonymous () { - import bb, re - if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): - bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) - elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): - bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) -} - -do_configure () { - # Setup these vars for cross building only - if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc" - export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc" - export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++" - export AS_FOR_TARGET="${HOST_PREFIX}as" - export LD_FOR_TARGET="${HOST_PREFIX}ld" - export NM_FOR_TARGET="${HOST_PREFIX}nm" - export AR_FOR_TARGET="${HOST_PREFIX}ar" - export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib" - fi - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} diff --git a/packages/gcc/gcc-3.3.4.inc b/packages/gcc/gcc-3.3.4.inc index db10dbe9bf..eec46d556d 100644 --- a/packages/gcc/gcc-3.3.4.inc +++ b/packages/gcc/gcc-3.3.4.inc @@ -16,56 +16,3 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-com.patch;patch=1 \ file://bash3.patch;patch=1" -PREMIRRORS_prepend () { -${GNU_MIRROR}/gcc/releases/ ftp://gcc.gnu.org/pub/gcc/releases/ -${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ -} - -S = "${WORKDIR}/gcc-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - -EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ - --with-gnu-ld \ - --enable-shared \ - --enable-multilib \ - --enable-target-optspace \ - --enable-languages=c,c++,f77 \ - --enable-threads=posix \ - --enable-c99 \ - --enable-long-long \ - --enable-symvers=gnu \ - --program-prefix=${TARGET_PREFIX} \ - ${EXTRA_OECONF_PATHS} \ - ${EXTRA_OECONF_DEP}" - -EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \ - --with-gxx-include-dir=${includedir}/c++/${PV}" - -EXTRA_OECONF_DEP = "" -EXTRA_OECONF_uclibc = "--disable-__cxa_atexit" -EXTRA_OECONF_glibc = "--enable-__cxa_atexit" -EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}" - -python __anonymous () { - import bb, re - if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): - bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) - elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): - bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) -} - -do_configure () { - # Setup these vars for cross building only - if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc" - export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc" - export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++" - export AS_FOR_TARGET="${HOST_PREFIX}as" - export LD_FOR_TARGET="${HOST_PREFIX}ld" - export NM_FOR_TARGET="${HOST_PREFIX}nm" - export AR_FOR_TARGET="${HOST_PREFIX}ar" - export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib" - fi - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} diff --git a/packages/gcc/gcc-3.4.3.inc b/packages/gcc/gcc-3.4.3.inc index 748498c12e..6511dfbd17 100644 --- a/packages/gcc/gcc-3.4.3.inc +++ b/packages/gcc/gcc-3.4.3.inc @@ -16,5 +16,3 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 " - -require gcc3-build.inc diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc index b529917607..2cd2ddd4a4 100644 --- a/packages/gcc/gcc-3.4.4.inc +++ b/packages/gcc/gcc-3.4.4.inc @@ -21,5 +21,3 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " - -require gcc3-build.inc diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc index 511af4e618..7b231771f1 100644 --- a/packages/gcc/gcc-4.0.0.inc +++ b/packages/gcc/gcc-4.0.0.inc @@ -5,4 +5,5 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -require gcc4-build.inc +# Language Overrides +FORTRAN = ",f95" diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc index 078ad2cc71..a0a6a6ae66 100644 --- a/packages/gcc/gcc-4.0.2.inc +++ b/packages/gcc/gcc-4.0.2.inc @@ -22,9 +22,8 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " - -require gcc4-build.inc +# Language Overrides +FORTRAN = "" EXTRA_OECONF += "--disable-libssp" -FORTRAN = "" diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc index 218ad48a1a..4e6dcfd4e2 100644 --- a/packages/gcc/gcc-4.1.0.inc +++ b/packages/gcc/gcc-4.1.0.inc @@ -11,9 +11,9 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" +# Language Overrides FORTRAN = "" diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc index 6796eea9ce..4d0c935d59 100644 --- a/packages/gcc/gcc-4.1.1.inc +++ b/packages/gcc/gcc-4.1.1.inc @@ -36,18 +36,9 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \ file://ppc-sfp-long-double-gcc411-7.patch;patch=1 " - -#Set the fortran bits -# 'fortran' or '', not 'f77' like gcc3 had +# Language Overrides FORTRAN = "" - -#Set the java bits -JAVA_arm = "" JAVA = "" -LANGUAGES = "c,c++${FORTRAN}${JAVA}" -require gcc3-build.inc - - EXTRA_OECONF += " --disable-libssp " diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc index 995289d477..739ecd728c 100644 --- a/packages/gcc/gcc-4.1.2.inc +++ b/packages/gcc/gcc-4.1.2.inc @@ -48,19 +48,12 @@ do_compile_prepend_avr32() { ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux } -#Set the fortran bits -# ',fortran' or '', not 'f77' like gcc3 had -FORTRAN = "" -#Set the java bits +# Language Overrides +FORTRAN = "" JAVA = "" -JAVA_arm = "" - - -LANGUAGES = "c,c++${FORTRAN}${JAVA}" -require gcc3-build.inc -ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR} +ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}" EXTRA_OECONF += " --disable-libssp " diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc index 3d08efbc65..fb5ed690d0 100644 --- a/packages/gcc/gcc-4.2.1.inc +++ b/packages/gcc/gcc-4.2.1.inc @@ -84,19 +84,12 @@ PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}" SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " -#Set the fortran bits -# 'i,fortran' or '', not 'f77' like gcc3 had +# Language Overrides FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" - -#Set the java bits JAVA = "" -JAVA_arm = "" - -LANGUAGES = "c,c++${FORTRAN}${JAVA}" -require gcc3-build.inc -ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR} +ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}" EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap " diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index 4959cc711f..aa35fdf9af 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -62,20 +62,14 @@ PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}" SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " -#Set the fortran bits -# 'i,fortran' or '', not 'f77' like gcc3 had -FORTRAN = "" -FORTRAN_linux-gnueabi = ",fortran" - DEPENDS += " gmp mpfr " -#Set the java bits +# Language Overrides +FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" JAVA = "" -JAVA_arm = "" -LANGUAGES = "c,c++${FORTRAN}${JAVA}" -require gcc3-build.inc -ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR} +ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}" EXTRA_OECONF += " --disable-libssp --disable-bootstrap " diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc index 5bb46e1f9b..1097614969 100644 --- a/packages/gcc/gcc-common.inc +++ b/packages/gcc/gcc-common.inc @@ -18,6 +18,18 @@ SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs" DEBIANNAME_libgcc = "libgcc1" -# Some default values +MIRRORS_prepend () { +${GNU_MIRROR}/gcc/releases/ ftp://gcc.gnu.org/pub/gcc/releases/ +${GNU_MIRROR}/gcc/ http://mirrors.rcn.net/pub/sourceware/gcc/releases/ +${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ +${GNU_MIRROR}/gcc/ http://gcc.get-software.com/releases/ +} + +# +# Set some default values +# gcclibdir = "${libdir}/gcc" BINV = "${PV}" +S = "${WORKDIR}/gcc-${PV}" +B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" + diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc-configure-common.inc index 57af41d926..9971c08c20 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc-configure-common.inc @@ -1,20 +1,15 @@ -MIRRORS_prepend () { -${GNU_MIRROR}/gcc/releases/ ftp://gcc.gnu.org/pub/gcc/releases/ -${GNU_MIRROR}/gcc/ http://mirrors.rcn.net/pub/sourceware/gcc/releases/ -${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ -${GNU_MIRROR}/gcc/ http://gcc.get-software.com/releases/ -} - -S = "${WORKDIR}/gcc-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" +# +# Build the list of lanaguages to build. +# +# These can be overridden by the version specific .inc file. -# gcj doesn't work on some architectures +# Java (gcj doesn't work on all architectures) JAVA ?= ",java" JAVA_arm ?= "" JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" -# gcc4-build sets this to fortran +# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' FORTRAN ?= ",f77" LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" @@ -30,12 +25,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, --enable-symvers=gnu \ --enable-libstdcxx-pch \ --program-prefix=${TARGET_PREFIX} \ - ${EXTRA_OECONF_PATHS} \ - ${EXTRA_OECONF_DEP}" - -EXTRA_OECONF_PATHS = " \ - --with-local-prefix=${prefix}/local \ - --with-gxx-include-dir=${includedir}/c++/${BINV}" + ${EXTRA_OECONF_PATHS}" # Build uclibc compilers without cxa_atexit support EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" @@ -81,3 +71,4 @@ do_configure () { (cd ${S} && gnu-configize) || die "failure running gnu-configize" oe_runconf } + diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc-configure-cross.inc index 287440e507..9fc3b77fea 100644 --- a/packages/gcc/gcc3-build-cross.inc +++ b/packages/gcc/gcc-configure-cross.inc @@ -1,3 +1,5 @@ +require gcc-configure-common.inc + USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ @@ -50,3 +52,4 @@ do_stage_append () { sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true } + diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc-configure-sdk.inc index b66c716505..e7fed06876 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc-configure-sdk.inc @@ -1,3 +1,6 @@ +require gcc-configure-common.inc + +# The two lines below conflict, this needs fixing - RP USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' diff --git a/packages/gcc/gcc-configure-target.inc b/packages/gcc/gcc-configure-target.inc new file mode 100644 index 0000000000..04045aa541 --- /dev/null +++ b/packages/gcc/gcc-configure-target.inc @@ -0,0 +1,6 @@ +require gcc-configure-common.inc + +EXTRA_OECONF_PATHS = " \ + --with-local-prefix=${prefix}/local \ + --with-gxx-include-dir=${includedir}/c++/${BINV}" + diff --git a/packages/gcc/gcc-cross-sdk.inc b/packages/gcc/gcc-cross-sdk.inc new file mode 100644 index 0000000000..fb24342939 --- /dev/null +++ b/packages/gcc/gcc-cross-sdk.inc @@ -0,0 +1,4 @@ +inherit sdk + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" + diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index 17faff5fff..6ed5d4106b 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -3,7 +3,8 @@ PR = "r3" inherit sdk require gcc-${PV}.inc -require gcc3-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" +SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb index 721e677a29..481f314d85 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.3.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb @@ -1,9 +1,8 @@ PR = "r1" -inherit sdk - require gcc-${PV}.inc -require gcc3-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
\ No newline at end of file +SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index 14d00830ac..1a7faa5b8c 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -1,9 +1,8 @@ PR = "r3" -inherit sdk - require gcc-${PV}.inc -require gcc3-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
\ No newline at end of file +SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 7ccb2f3c66..5cba195f17 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,9 +1,8 @@ PR = "r2" -inherit sdk - require gcc-${PV}.inc -require gcc4-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
\ No newline at end of file +DEPENDS += "gmp-native mpfr-native"
\ No newline at end of file diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb index e07d568f6a..8329aac27f 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,9 +1,8 @@ PR = "r3" -inherit sdk - require gcc-${PV}.inc -require gcc4-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
\ No newline at end of file +DEPENDS += "gmp-native mpfr-native"
\ No newline at end of file diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index 1f28791ad4..89f698477f 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,11 +1,10 @@ PR = "r5" -inherit sdk - require gcc-${PV}.inc -require gcc4-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb index b9fc685d98..7e3a459ea8 100644 --- a/packages/gcc/gcc-cross-sdk_4.2.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb @@ -3,10 +3,11 @@ PR = "r3" inherit sdk require gcc-${PV}.inc -require gcc4-build-sdk.inc +require gcc-cross-sdk.inc +require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index b64756246c..c3a4daa359 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -2,55 +2,6 @@ PR = "r3" require gcc-${PV}.inc require gcc-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" - -export CPPFLAGS = "" -export CXXFLAGS = "" -export CFLAGS = "" -export LDFLAGS = "" - -do_configure () { - export CC="${BUILD_CC}" - export AR="${TARGET_SYS}-ar" - export RANLIB="${TARGET_SYS}-ranlib" - export LD="${TARGET_SYS}-ld" - export NM="${TARGET_SYS}-nm" - rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_compile_prepend () { - export CC="${BUILD_CC}" - export AR_FOR_TARGET="${TARGET_SYS}-ar" - export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" - export LD_FOR_TARGET="${TARGET_SYS}-ld" - export NM_FOR_TARGET="${TARGET_SYS}-nm" - export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" -} - -do_stage_append () { - for d in info man share/doc share/locale ; do - rm -rf ${CROSS_DIR}/$d - done - - # Fix a few include links so cross builds are happier - if [ ! -e ${STAGING_INCDIR}/c++ ]; then - mkdir -p ${STAGING_INCDIR} - rm -f ${STAGING_INCDIR}/c++ - ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ - ${STAGING_INCDIR}/ - fi - - # We use libiberty from binutils - rm -f ${CROSS_DIR}/lib/libiberty.a - - # We probably don't need these - rmdir ${CROSS_DIR}/include || : - - # We don't really need to keep this around - rm -rf ${CROSS_DIR}/share -} diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 32c052c73b..5b9c8f3cc5 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -2,5 +2,5 @@ PR="r6" require gcc-${PV}.inc require gcc-cross.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb index 5aeb2c2eb9..ccc2ceea69 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -2,5 +2,5 @@ PR = "r13" require gcc-${PV}.inc require gcc-cross.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index dafdf4afad..4d93346d8d 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -2,5 +2,5 @@ PR = "r8" require gcc-${PV}.inc require gcc-cross.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 3b8b898464..40f514062f 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -2,5 +2,5 @@ PR = "r4" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb index 451136e4c4..c296a03237 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -2,5 +2,5 @@ PR = "r10" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 8d2d4dad89..576d487b34 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -2,7 +2,7 @@ PR = "r5" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 6788bc0d82..ab3fc405d0 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -2,7 +2,7 @@ PR = "r18" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 942c794669..8ede230269 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -2,7 +2,7 @@ PR = "r14" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index d03ce778ae..06f5305365 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -2,7 +2,7 @@ PR = "r13" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 83d9ca9f6a..26dd9f8232 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -2,7 +2,7 @@ PR = "r6" require gcc-${PV}.inc require gcc-cross4.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 2b7b81ee80..09f09faacd 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -2,5 +2,5 @@ PR = "r2" require gcc-csl-arm-2005q3.inc require gcc-cross.inc -require gcc3-build-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/packages/gcc/gcc-csl-arm-2005q3.inc b/packages/gcc/gcc-csl-arm-2005q3.inc index bcff26519b..5d77ecbd07 100644 --- a/packages/gcc/gcc-csl-arm-2005q3.inc +++ b/packages/gcc/gcc-csl-arm-2005q3.inc @@ -1,4 +1,5 @@ require gcc-common.inc + BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" PV_chinook-compat = "3.4.4cs2005q3.2" @@ -9,6 +10,8 @@ SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-20 file://gcc_optab_arm.patch;patch=1 \ file://gcc-3.4.4-eabi-bigendian.patch;patch=1" +S = "${WORKDIR}/gcc-2005q3" + do_unpack2() { cd ${WORKDIR} tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2 @@ -16,6 +19,4 @@ do_unpack2() { addtask unpack2 after do_unpack before do_patch -require gcc3-build.inc -S = "${WORKDIR}/gcc-2005q3" diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb index dd4402dccf..6f74a1ea46 100644 --- a/packages/gcc/gcc-native_3.4.4.bb +++ b/packages/gcc/gcc-native_3.4.4.bb @@ -1,5 +1,6 @@ PR = "r7" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-native.inc PROVIDES += "gcc3-native" diff --git a/packages/gcc/gcc3-build-sdk.inc b/packages/gcc/gcc3-build-sdk.inc deleted file mode 100644 index 5bc187b745..0000000000 --- a/packages/gcc/gcc3-build-sdk.inc +++ /dev/null @@ -1,29 +0,0 @@ -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' - -SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' - -STAGING_TARGET_INCDIR = "${STAGING_DIR_TARGET}${layout_includedir}" -STAGING_TARGET_LIBDIR = "${STAGING_DIR_TARGET}${layout_libdir}" - -EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" - -do_configure () { - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - (cd ${S}/libstdc++-v3 && autoreconf) - oe_runconf - mkdir -p gcc - ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as - ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld - ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include - ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/ -} - -do_compile () { - export CC="${BUILD_CC}" - export AR_FOR_TARGET="${TARGET_SYS}-ar" - export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" - export LD_FOR_TARGET="${TARGET_SYS}-ld" - export NM_FOR_TARGET="${TARGET_SYS}-nm" - export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}" - oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" -} diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc deleted file mode 100644 index f745ad22ab..0000000000 --- a/packages/gcc/gcc4-build.inc +++ /dev/null @@ -1,4 +0,0 @@ -FORTRAN = ",f95" - -include gcc3-build.inc - diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index 0a29996c09..cc7540af15 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -1,4 +1,5 @@ PR = "r3" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index 0a29996c09..cc7540af15 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -1,4 +1,5 @@ PR = "r3" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb index 96662d5498..73e908ae24 100644 --- a/packages/gcc/gcc_3.4.3.bb +++ b/packages/gcc/gcc_3.4.3.bb @@ -1,4 +1,5 @@ PR = "r12" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 1a56a377f7..5e2598079b 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -1,4 +1,5 @@ PR = "r7" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index 0a29996c09..cc7540af15 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -1,4 +1,5 @@ PR = "r3" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index 1a56a377f7..5e2598079b 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -1,4 +1,5 @@ PR = "r7" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 0a29996c09..cc7540af15 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -1,4 +1,5 @@ PR = "r3" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 9f19110432..8ae871074c 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,5 @@ PR = "r18" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 8e244b2cad..43d55fa601 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,4 +1,5 @@ PR = "r11" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index e3c91ac116..7ec84b6012 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,4 +1,5 @@ PR = "r9" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index a32b55f91f..153c5bff88 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -1,6 +1,7 @@ PR = "r6" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 0a29996c09..cc7540af15 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -1,4 +1,5 @@ PR = "r3" require gcc-${PV}.inc +require gcc-configure-target.inc require gcc-package-target.inc |