From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Dec 2010 07:30:15 +0000 (-0800)
Subject: gcc-4.5.inc/gcc-svn.inc: Dont do the sourcedir move dance.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c8570552549da2e11428d08b2bc08849cac39b1;p=openembedded.git

gcc-4.5.inc/gcc-svn.inc: Dont do the sourcedir move dance.

In some cases the rename_srcdir ended up moving the sourcedir
as a sub-directory under gcc-4.5 which was not intended actually
it is intended to be renamed and not moved. Which was seen recently
where people complained about a patch not being applied to gcc-4.5
even though patch was not changed. The reason was the srcdir was
moved instead of renaming. This could happen if target dir already
existed.

Anyway so we get rid of this dance completely. So nip the evil
in the bud

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc
index 512bc1750c..df462e0cda 100644
--- a/recipes/gcc/gcc-4.5.inc
+++ b/recipes/gcc/gcc-4.5.inc
@@ -145,13 +145,8 @@ SRC_URI_append_mips64el = " file://mips64-nomultilib.patch "
 # Language Overrides
 FORTRAN = ""
 JAVA = ""
-rename_srcdir (){
-        mv ${WORKDIR}/${BRANCH} ${WORKDIR}/gcc-${PV}
-}
 
-do_unpack_append() {
-        bb.build.exec_func('rename_srcdir', d)
-}
+S = "${WORKDIR}/${BRANCH}"
 
 EXTRA_OECONF_BASE = " --enable-lto \
 		      --enable-libssp \
diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc
index 468f62b1f9..f4b65090fd 100644
--- a/recipes/gcc/gcc-svn.inc
+++ b/recipes/gcc/gcc-svn.inc
@@ -8,12 +8,13 @@ require gcc-common.inc
 DEPENDS = "mpfr gmp libmpc"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
+BRANCH = "trunk"
 BINV = "4.6.0"
 PV = "4.6+svnr${SRCPV}"
 
 FILESPATHPKG .= ":gcc-svn"
 
-SRC_URI = "svn://gcc.gnu.org/svn/gcc;module=trunk \
+SRC_URI = "svn://gcc.gnu.org/svn/gcc;module=${BRANCH} \
 	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
 	   file://100-uclibc-conf.patch \
            file://gcc-uclibc-locale-ctype_touplow_t.patch \
@@ -32,13 +33,8 @@ EXTRA_OECONF_BASE = " --enable-libssp \
 EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
 EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
-rename_srcdir (){
-	mv ${WORKDIR}/trunk ${WORKDIR}/gcc-${PV}
-}
+S = ${WORKDIR}/${BRANCH}
 
-do_unpack_append() {
-        bb.build.exec_func('rename_srcdir', d)
-}
 EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "