[oe-commits] org.oe.dev gcc: Move old style gccbuild.inc includes into gcc-configure-{target|cross|sdk} and a common include file. Factor some common data not related to configure into gcc-common.inc. Rewrite 3.3.3 and 3.3.4 recipes to use standard includes (tested and they work).

Mon Mar 17 09:01:28 UTC 2008

gcc: Move old style gcc*build*.inc includes into gcc-configure-{target|cross|sdk} and a common include file. Factor some common data not related to configure into gcc-common.inc. Rewrite 3.3.3 and 3.3.4 recipes to use standard includes (tested and they work).

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8fb4dfc6391cf0974d28e10236a7d28aaa261b7a
ViewMTN: http://monotone.openembedded.org/revision/info/8fb4dfc6391cf0974d28e10236a7d28aaa261b7a
Files:
1
packages/gcc/gcc3-build-cross.inc
packages/gcc/gcc3-build-sdk.inc
packages/gcc/gcc3-build.inc
packages/gcc/gcc4-build-sdk.inc
packages/gcc/gcc4-build.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-configure-cross.inc
packages/gcc/gcc-configure-sdk.inc
packages/gcc/gcc-configure-target.inc
packages/gcc/gcc-cross-sdk.inc
packages/gcc/gcc-3.3.3.inc
packages/gcc/gcc-3.3.4.inc
packages/gcc/gcc-3.4.3.inc
packages/gcc/gcc-3.4.4.inc
packages/gcc/gcc-4.0.0.inc
packages/gcc/gcc-4.0.2.inc
packages/gcc/gcc-4.1.0.inc
packages/gcc/gcc-4.1.1.inc
packages/gcc/gcc-4.1.2.inc
packages/gcc/gcc-4.2.1.inc
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-common.inc
packages/gcc/gcc-cross-sdk_3.3.4.bb
packages/gcc/gcc-cross-sdk_3.4.3.bb
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross-sdk_4.1.0.bb
packages/gcc/gcc-cross-sdk_4.1.1.bb
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_3.3.3.bb
packages/gcc/gcc-cross_3.3.4.bb
packages/gcc/gcc-cross_3.4.3.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc-cross_4.0.0.bb
packages/gcc/gcc-cross_4.0.2.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_csl-arm-2005q3.bb
packages/gcc/gcc-csl-arm-2005q3.inc
packages/gcc/gcc-native_3.4.4.bb
packages/gcc/gcc_3.3.3.bb
packages/gcc/gcc_3.3.4.bb
packages/gcc/gcc_3.4.3.bb
packages/gcc/gcc_3.4.4.bb
packages/gcc/gcc_4.0.0.bb
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/gcc/gcc_csl-arm-2005q3.bb
Diffs:

#
# mt diff -rb95de2cdef0d381e577811f2bcd4547b493c0db7 -r8fb4dfc6391cf0974d28e10236a7d28aaa261b7a
#
#
#
# delete "packages/gcc/gcc3-build-cross.inc"
# 
# delete "packages/gcc/gcc3-build-sdk.inc"
# 
# delete "packages/gcc/gcc3-build.inc"
# 
# delete "packages/gcc/gcc4-build-sdk.inc"
# 
# delete "packages/gcc/gcc4-build.inc"
# 
# add_file "packages/gcc/gcc-configure-common.inc"
#  content [9527c54496aeeaf2edc8fba8511c9407f24c713b]
# 
# add_file "packages/gcc/gcc-configure-cross.inc"
#  content [3990357451a08ec6257ea5ed8657804e6d383af7]
# 
# add_file "packages/gcc/gcc-configure-sdk.inc"
#  content [d26e8cf65fcbd75507b4c227459097ded00a5ba3]
# 
# add_file "packages/gcc/gcc-configure-target.inc"
#  content [3248ca383910d13e72946cacae4f35ccc0861ca7]
# 
# add_file "packages/gcc/gcc-cross-sdk.inc"
#  content [7803ab3ad0cf4fdff3d6d8480bf458881c235155]
# 
# patch "packages/gcc/gcc-3.3.3.inc"
#  from [99a113671db98abc675e951f7991f2a43b35d154]
#    to [2c29c9da5d15b2348df06e202a8dc65c5a8b41ab]
# 
# patch "packages/gcc/gcc-3.3.4.inc"
#  from [44d147bd0fe7e968a0f408113dc6fa1ce9d90d64]
#    to [a3c894bbf86e0623980c091d23cf4cd8508bb800]
# 
# patch "packages/gcc/gcc-3.4.3.inc"
#  from [e30aafb40c2364ea3e052554974e59a5418f511c]
#    to [6defbc5e25b6d887c2945a31c704fa6f99578b64]
# 
# patch "packages/gcc/gcc-3.4.4.inc"
#  from [d1f2025593f17df9bbea67d77fa94ab85d92276b]
#    to [73b4aafdf30109a7505a9fb445c964fa76353192]
# 
# patch "packages/gcc/gcc-4.0.0.inc"
#  from [331d72f43d10857fde27fe34c356e78298acc03a]
#    to [80dc261f1372a1378f6eef33de989261889507f0]
# 
# patch "packages/gcc/gcc-4.0.2.inc"
#  from [d14f93793aba1ba329501dad916827f3261b1d0d]
#    to [8562f4dabb504c318f47bad1483bba2281f5613d]
# 
# patch "packages/gcc/gcc-4.1.0.inc"
#  from [b1e4469995e46d7d994b69ab079de199f6897d3a]
#    to [9d906bb8346309a4dd23b1355ad4a5ef0fcbd05b]
# 
# patch "packages/gcc/gcc-4.1.1.inc"
#  from [f90cf6f4b1299d0da930e1cade8a3a337fbc0b37]
#    to [dcd4c6dfa31f6ee63680b87b6cb6e63dbc4259df]
# 
# patch "packages/gcc/gcc-4.1.2.inc"
#  from [6f85d20db29385ac4379f1480627f4850c822d60]
#    to [ea4c93de5894bc0066da188283fe805edeacb5b1]
# 
# patch "packages/gcc/gcc-4.2.1.inc"
#  from [834497a6707b15f1e8b1d449f7863d83adf0b0f1]
#    to [b2dad6fe9f434fe1bb6e3235d31705b4fe42a994]
# 
# patch "packages/gcc/gcc-4.2.2.inc"
#  from [13e6aba7d5ee47a5289255ca43b3892e63cf0ebd]
#    to [222ec837b8ec3964eab255f0d7a79859d0c8a19c]
# 
# patch "packages/gcc/gcc-common.inc"
#  from [d9d032ec8b9bb0168ad0c5b150e5953cf7d06df2]
#    to [d822366ae93de78afdf2d5e406e4552411171087]
# 
# patch "packages/gcc/gcc-cross-sdk_3.3.4.bb"
#  from [2a597c4647e0dc1a8db9ac85703f020444fa0714]
#    to [4b104eb502c6ffc5b366568803a6f77f5c0bfe8e]
# 
# patch "packages/gcc/gcc-cross-sdk_3.4.3.bb"
#  from [375feb4b5479bb970c43a583569d72a7a397498d]
#    to [881c4f06a5bb5c056959b17d6a838ff1d8bf7c03]
# 
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
#  from [e96ab747774ac35b1d38a9df31149cb0402c2fcd]
#    to [c7b26831431df36f7ec43e3a4e05dc2fd5d1f0e2]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.0.bb"
#  from [a7c573774085ee31465045fd6d4f88e85b593648]
#    to [cbd3665e41d3b7947822f3f58d8d0d1c84c1d72c]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.1.bb"
#  from [e34692c3b13b3a8c07b6d4c1370f0755cad6913b]
#    to [c105050e34da02d945ff7cbca5239bffe34fdfae]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.2.bb"
#  from [64f98334dc7d7e5210d541da40fbce1ad14ddf0a]
#    to [39e071149570e969631c8318bd251d91b8ceb024]
# 
# patch "packages/gcc/gcc-cross-sdk_4.2.2.bb"
#  from [af4fcc894ae68eb264241857b7d2258c802126f4]
#    to [0c286ca7cbc848c675d95b7702f4d90178b0b07f]
# 
# patch "packages/gcc/gcc-cross_3.3.3.bb"
#  from [38620c97f258fcf7a106d748386c80999510aebe]
#    to [badb7f76f510370f482a41de29619a9f0236bb33]
# 
# patch "packages/gcc/gcc-cross_3.3.4.bb"
#  from [495a239d4154a8546aeaada56aa9c9c335625422]
#    to [623b9f49a8c468d322327c157aa3e115ce042f8f]
# 
# patch "packages/gcc/gcc-cross_3.4.3.bb"
#  from [81c2b37fe0c567571d2805c3583021c114a305fa]
#    to [45073e2c11041bad8bea150d07665eec9f998061]
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [7659a0ab29bf5aa41fca9aebaafabdc3743b0b10]
#    to [2ff18cdc337c9d4c221bf3bdcef029f12c0fbded]
# 
# patch "packages/gcc/gcc-cross_4.0.0.bb"
#  from [46e7ba713259a27b7454fbbf1ec3040b1db6f1b5]
#    to [64a3e396ff7f0597644027348f8fb0b1b06ed369]
# 
# patch "packages/gcc/gcc-cross_4.0.2.bb"
#  from [6c08c4cf861c04949abc82ea8f25bc414c5555ec]
#    to [ab726cb3263e0c93664774134632e2e43d928c12]
# 
# patch "packages/gcc/gcc-cross_4.1.0.bb"
#  from [f79a8571c7c310d7e8f249781213ff1cd452bae1]
#    to [14a8ed20c448ee203b13cd9f0d3cea8536d49404]
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [2c498fa02b99cc44c7306a74e46933a8b0e9c5b5]
#    to [db43e01764b29d3ab92c9c5251bbc34e6fed67a6]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [3f17dc324440bfb61feb169309276fb83739e2ae]
#    to [1392ed3fa53497787715d7bc4e23ce047ff87351]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [6ebd24de5b970d396a1f1d58e30e96d7ed8c762f]
#    to [0cf18cf5e4e7b7b0bfd975f9165352c24c43dc78]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [5d74508913647e8ea6d134d3dcc50482f2b1d611]
#    to [dc185d7ef480edbbda447e52305cbb0cca6f8ac1]
# 
# patch "packages/gcc/gcc-cross_csl-arm-2005q3.bb"
#  from [2f55c07592d9205599c92d58bc3f4f8a2a8d58c9]
#    to [9823b6ccd097af428766747124fdc15b1ae0fc63]
# 
# patch "packages/gcc/gcc-csl-arm-2005q3.inc"
#  from [26aeacb058a9f8a8ec784bbf2338d4268fe5fc94]
#    to [8f189cd5d528220a1febbf32675b9a169213dde0]
# 
# patch "packages/gcc/gcc-native_3.4.4.bb"
#  from [e8edb8219df12702a453cc6e2a2f232024fac104]
#    to [3ea48c320fa78bb4f06fedbf4778d458e4daaf43]
# 
# patch "packages/gcc/gcc_3.3.3.bb"
#  from [4dbc09379dd7b69ef3c30cdac83fcac98088baca]
#    to [6cd784b76350f135e9760161acf994ca9ec65417]
# 
# patch "packages/gcc/gcc_3.3.4.bb"
#  from [4dbc09379dd7b69ef3c30cdac83fcac98088baca]
#    to [6cd784b76350f135e9760161acf994ca9ec65417]
# 
# patch "packages/gcc/gcc_3.4.3.bb"
#  from [a3797bdeaa6ebd96d06d2b09b8da9270ce0c0e4e]
#    to [1c2f50c228fdc74679e4566f3c03ade3a478001b]
# 
# patch "packages/gcc/gcc_3.4.4.bb"
#  from [a435e39953e3e813db5ce3fd2a2b031bfdad9d58]
#    to [251901a81f531d21ee0252534fc3112a97f4712d]
# 
# patch "packages/gcc/gcc_4.0.0.bb"
#  from [4dbc09379dd7b69ef3c30cdac83fcac98088baca]
#    to [6cd784b76350f135e9760161acf994ca9ec65417]
# 
# patch "packages/gcc/gcc_4.0.2.bb"
#  from [a435e39953e3e813db5ce3fd2a2b031bfdad9d58]
#    to [251901a81f531d21ee0252534fc3112a97f4712d]
# 
# patch "packages/gcc/gcc_4.1.0.bb"
#  from [4dbc09379dd7b69ef3c30cdac83fcac98088baca]
#    to [6cd784b76350f135e9760161acf994ca9ec65417]
# 
# patch "packages/gcc/gcc_4.1.1.bb"
#  from [f74cfff3c60ef50a39f56ba09ea29cde8543648f]
#    to [1c61869a8f58f8b6adf00ca4920fd7070bbfbf94]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [df7de25544842a5d2397396d6da7c8384fc3f894]
#    to [467a39e619af2ea2b9eb324377ca9d3eb4882a57]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [964ba491dde21969130d528b7fd415feaa90dc13]
#    to [7e70e14bb78e6cb4d320e5882bdc223dfc59616e]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [f29bf48a3d25ed2aca4c7a48402687e66a222580]
#    to [23b19adffa5c9282eaa50551168babea1b8d5791]
# 
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
#  from [4dbc09379dd7b69ef3c30cdac83fcac98088baca]
#    to [6cd784b76350f135e9760161acf994ca9ec65417]
#
============================================================

--- packages/gcc/gcc-configure-common.inc	9527c54496aeeaf2edc8fba8511c9407f24c713b
+++ packages/gcc/gcc-configure-common.inc	9527c54496aeeaf2edc8fba8511c9407f24c713b
@@ -0,0 +1,74 @@
+#
+# Build the list of lanaguages to build.
+#
+# These can be overridden by the version specific .inc file.
+
+# Java (gcj doesn't work on all architectures)
+JAVA ?= ",java"
+JAVA_arm ?= ""
+JAVA_armeb ?= ""
+JAVA_mipsel ?= ""
+JAVA_sh3 ?= ""
+# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
+FORTRAN ?= ",f77"
+LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
+
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
+                --with-gnu-ld \
+                --enable-shared \
+                --enable-target-optspace \
+                --enable-languages=${LANGUAGES} \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --enable-libstdcxx-pch \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS}"
+
+# Build uclibc compilers without cxa_atexit support
+EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-gnueabi       = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibc        = " --disable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
+EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+CPPFLAGS = ""
+
+# Used by configure to define additional values for FLAGS_FOR_TARGET -
+# passed to all the compilers.
+ARCH_FLAGS_FOR_TARGET = ""
+#NOTE: not tested on other platforms, the following is probably correct
+# everywhere!
+ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}"
+ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}"
+EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
+
+do_configure () {
+	# Setup these vars for cross building only
+	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the
+	# gcc build stuff when the build is producing a cross compiler - i.e.
+	# when the 'current' target is the 'host' system, and the host is not
+	# the target (because the build is actually making a cross compiler!)
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CC}"
+		export GCC_FOR_TARGET="${CC}"
+		export CXX_FOR_TARGET="${CXX}"
+		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 GFORTRAN_FOR_TARGET="gfortran"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}"
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
============================================================
--- packages/gcc/gcc-configure-cross.inc	3990357451a08ec6257ea5ed8657804e6d383af7
+++ packages/gcc/gcc-configure-cross.inc	3990357451a08ec6257ea5ed8657804e6d383af7
@@ -0,0 +1,55 @@
+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} \
+		      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-sysroot=${STAGING_DIR_TARGET} \
+                      --with-build-sysroot=${STAGING_DIR_TARGET}"
+
+do_configure_prepend () {
+	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+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 ${TARGET_CC_ARCH}"
+}
+
+LIBGCCS_VAR = "-lgcc_s"
+LIBGCCS_VAR_avr32 = ""
+
+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}
+		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 but leave java there
+	for d in share/man share/info;
+	do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	#fix up libsupc++ and libstdc++ la files
+	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
+}
+
============================================================
--- packages/gcc/gcc-configure-sdk.inc	d26e8cf65fcbd75507b4c227459097ded00a5ba3
+++ packages/gcc/gcc-configure-sdk.inc	d26e8cf65fcbd75507b4c227459097ded00a5ba3
@@ -0,0 +1,51 @@
+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 )}'
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-sysroot=${prefix}/${TARGET_SYS} \
+                      --with-build-sysroot=${STAGING_DIR_TARGET}"
+
+#
+# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
+# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
+#
+export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar"
+export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as"
+export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool"
+export LD_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ld"
+export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo"
+export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm"
+export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump"
+export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib"
+export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip"
+export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres"
+
+#
+# We need to override this and make sure the compiler can find staging
+#
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=/media/build1/builds/oe/angstrom/tmp/staging/arm-angstrom-linux-gnueabi"
+
+do_configure () {
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+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}"
+	base_do_compile
+}
============================================================
--- packages/gcc/gcc-configure-target.inc	3248ca383910d13e72946cacae4f35ccc0861ca7
+++ packages/gcc/gcc-configure-target.inc	3248ca383910d13e72946cacae4f35ccc0861ca7
@@ -0,0 +1,6 @@
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = " \
+    --with-local-prefix=${prefix}/local \
+    --with-gxx-include-dir=${includedir}/c++/${BINV}"
+
============================================================
--- packages/gcc/gcc-cross-sdk.inc	7803ab3ad0cf4fdff3d6d8480bf458881c235155
+++ packages/gcc/gcc-cross-sdk.inc	7803ab3ad0cf4fdff3d6d8480bf458881c235155
@@ -0,0 +1,4 @@
+inherit sdk
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+
============================================================
--- packages/gcc/gcc-3.3.3.inc	99a113671db98abc675e951f7991f2a43b35d154
+++ packages/gcc/gcc-3.3.3.inc	2c29c9da5d15b2348df06e202a8dc65c5a8b41ab
@@ -37,56 +37,3 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gc
 	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-%s
>>> DIFF TRUNCATED @ 16K






[oe-commits] org.oe.dev gcc: Move old style gcc*build*.inc includes into gcc-configure-{target|cross|sdk} and a common include file. Factor some common data not related to configure into gcc-common.inc. Rewrite 3.3.3 and 3.3.4 recipes to use standard includes (tested and they work).

[oe-commits] org.oe.dev gcc: Move old style gccbuild.inc includes into gcc-configure-{target|cross|sdk} and a common include file. Factor some common data not related to configure into gcc-common.inc. Rewrite 3.3.3 and 3.3.4 recipes to use standard includes (tested and they work).