fixes for cross/prefix build changes

BKrev: 3fc947c4cEIiIu4YtDwmjlqrssD-eA

3 files changed, 80 insertions, 8 deletions

diff --git a/gcc/gcc-initial-uclibc-cross_3.3.2.oe b/gcc/gcc-initial-uclibc-cross_3.3.2.oe
index e69de29bb2..7fb689e8e7 100644
--- a/gcc/gcc-initial-uclibc-cross_3.3.2.oe
+++ b/gcc/gcc-initial-uclibc-cross_3.3.2.oe
@@ -0,0 +1,16 @@
+include gcc-uclibc-cross_${PV}.oe
+
+DEPENDS := virtual/${TARGET_PREFIX}binutils \
+           virtual/uclibc-headers-initial patcher
+PROVIDES := virtual/${TARGET_PREFIX}gcc-initial
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --disable-nls \
+                --with-gnu-ld \
+                --disable-__cxa_atexit \
+                --enable-languages=c \
+                --disable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_PREFIX}
diff --git a/gcc/gcc-uclibc-cross_3.3.2.oe b/gcc/gcc-uclibc-cross_3.3.2.oe
index e69de29bb2..8170dcc576 100644
--- a/gcc/gcc-uclibc-cross_3.3.2.oe
+++ b/gcc/gcc-uclibc-cross_3.3.2.oe
@@ -0,0 +1,55 @@
+inherit cross
+include gcc-uclibc_${PV}.oe
+
+DEPENDS := virtual/${TARGET_PREFIX}binutils \
+           virtual/uclibc virtual/uclibc-headers patcher
+PROVIDES := virtual/${TARGET_PREFIX}gcc \
+            virtual/${TARGET_PREFIX}g++
+
+PACKAGES =
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --disable-nls \
+                --with-gnu-ld \
+                --disable-__cxa_atexit \
+                --enable-languages=c,c++ \
+                --enable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_PREFIX}
+
+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"
+	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 () {
+#	# Cleanup after gcc's --program-prefix failing..
+#	( cd ${CROSS_DIR}/bin ; for p in ${TARGET_SYS}-* ; do
+#		mv $p `echo $p | sed -e s,${TARGET_SYS},${TARGET_ARCH}-uclibc,`
+#	done )
+
+	rm -f ${CROSS_DIR}/bin/gccbug ${CROSS_DIR}/bin/gcov
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+}
diff --git a/gcc/gcc_3.3.2.oe b/gcc/gcc_3.3.2.oe
index 9cd81aaaf3..5b31f39908 100644
--- a/gcc/gcc_3.3.2.oe
+++ b/gcc/gcc_3.3.2.oe
@@ -4,17 +4,17 @@ DESCRIPTION := The GNU cc and gcc C compilers.
 LICENSE := GPL
 MAINTAINER := Gerald Britton <gbritton@doomcom.org>
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${CROSS}gcc \
+DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
            virtual/uclibc virtual/uclibc-headers patcher
 
 PACKAGES = ${PN} ${PN}-cplusplus \
            uclibc-libgcc uclibc-libstdcplusplus \
            ${PN}-doc
 
-FILES_${PN} = ${bindir}/${TARGET_SYS}-gcc \
-              ${bindir}/${TARGET_SYS}-cpp \
-              ${bindir}/${TARGET_SYS}-gcov \
-              ${bindir}/${TARGET_SYS}-gccbug \
+FILES_${PN} = ${bindir}/${TARGET_PREFIX}gcc \
+              ${bindir}/${TARGET_PREFIX}cpp \
+              ${bindir}/${TARGET_PREFIX}gcov \
+              ${bindir}/${TARGET_PREFIX}gccbug \
               ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
               ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
               ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
@@ -26,7 +26,7 @@ FILES_${PN} = ${bindir}/${TARGET_SYS}-gcc \
               ${bindir}/cc ${bindir}/gcc ${bindir}/cpp \
               ${bindir}/gcov ${bindir}/gccbug
 
-FILES_${PN}-cplusplus = ${bindir}/${TARGET_SYS}-g++ \
+FILES_${PN}-cplusplus = ${bindir}/${TARGET_PREFIX}g++ \
                   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus \
                   ${prefix}/${TARGET_SYS}/lib/libstdc++.so \
                   ${prefix}/${TARGET_SYS}/lib/libstdc++.la \
@@ -60,9 +60,9 @@ EXTRA_OECONF := --with-local-prefix=/usr/local \
                 --enable-languages=c,c++ \
                 --enable-shared \
                 --enable-multilib \
-                --program-prefix=${TARGET_SYS}-
+                --program-prefix=${TARGET_PREFIX}
 
-do_configure_prepend () {
+do_configure () {
 	# Setup these vars for cross building only
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
 		export CC_FOR_TARGET="${CCACHE} ${TARGET_PREFIX}gcc"
@@ -74,6 +74,7 @@ do_configure_prepend () {
 		export AR_FOR_TARGET="${TARGET_PREFIX}ar"
 		export RANLIB_FOR_TARGET="${TARGET_PREFIX}ranlib"
 	fi
+	oe_runconf
 }
 
 do_install () {