Patchwork [meta-oe] gcc: append PR to S to match oe-core and fix do_headerfix

login
register
mail settings
Submitter Denys Dmytriyenko
Date Aug. 12, 2011, 5:17 a.m.
Message ID <1313126272-32091-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/9695/
State New, archived
Headers show

Comments

Denys Dmytriyenko - Aug. 12, 2011, 5:17 a.m.
From: Denys Dmytriyenko <denys@ti.com>

This fixes the gcc-cross-inital failure, as reported here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/6150

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-oe/recipes-devtools/gcc/gcc-4.5.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Denys Dmytriyenko - Aug. 12, 2011, 6:31 a.m.
On Fri, Aug 12, 2011 at 01:17:52AM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> This fixes the gcc-cross-inital failure, as reported here:
> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/6150

BTW, one of the Linaro patches fails because the file got previously updated 
by do_headerfix(), which runs before do_patch(). A little manual intervention 
is currently required through TERMCMDRUN...
Khem Raj - Aug. 12, 2011, 6:40 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/11/2011 11:31 PM, Denys Dmytriyenko wrote:
> On Fri, Aug 12, 2011 at 01:17:52AM -0400, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@ti.com>
>> 
>> This fixes the gcc-cross-inital failure, as reported here: 
>> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/6150
>
>> 
> BTW, one of the Linaro patches fails because the file got previously
> updated by do_headerfix(), which runs before do_patch(). A little
> manual intervention is currently required through TERMCMDRUN...
> 

would you mind submitting a patch refresh ?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5EysEACgkQuwUzVZGdMxSltwCeLhuIjrTEkz7fMOc30aP8PZyM
Zf8AmwbvdZgbS1jn+ZDXe+q7nDui/uW4
=qCGh
-----END PGP SIGNATURE-----
Denys Dmytriyenko - Aug. 12, 2011, 6:51 a.m.
On Thu, Aug 11, 2011 at 11:40:02PM -0700, Khem Raj wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 08/11/2011 11:31 PM, Denys Dmytriyenko wrote:
> > On Fri, Aug 12, 2011 at 01:17:52AM -0400, Denys Dmytriyenko wrote:
> >> From: Denys Dmytriyenko <denys@ti.com>
> >> 
> >> This fixes the gcc-cross-inital failure, as reported here: 
> >> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/6150
> >
> >> 
> > BTW, one of the Linaro patches fails because the file got previously
> > updated by do_headerfix(), which runs before do_patch(). A little
> > manual intervention is currently required through TERMCMDRUN...
> > 
> 
> would you mind submitting a patch refresh ?

Sure, should follow shortly.
Denys Dmytriyenko - Aug. 12, 2011, 6:53 a.m.
On Fri, Aug 12, 2011 at 02:51:38AM -0400, Denys Dmytriyenko wrote:
> On Thu, Aug 11, 2011 at 11:40:02PM -0700, Khem Raj wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > On 08/11/2011 11:31 PM, Denys Dmytriyenko wrote:
> > > On Fri, Aug 12, 2011 at 01:17:52AM -0400, Denys Dmytriyenko wrote:
> > >> From: Denys Dmytriyenko <denys@ti.com>
> > >> 
> > >> This fixes the gcc-cross-inital failure, as reported here: 
> > >> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/6150
> > >
> > >> 
> > > BTW, one of the Linaro patches fails because the file got previously
> > > updated by do_headerfix(), which runs before do_patch(). A little
> > > manual intervention is currently required through TERMCMDRUN...
> > > 
> > 
> > would you mind submitting a patch refresh ?
> 
> Sure, should follow shortly.

Ah, forgot to clarify - it wasn't Linaro patch, it was old RP's 
64bithack.patch. See my other patch in this thread with the fix.

Patch

diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
index 662402c..aabc1cf 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
@@ -232,7 +232,7 @@  SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
 FORTRAN = ""
 JAVA = ""
 
-S = "${TMPDIR}/work-shared/gcc-${PV}/${BRANCH}"
+S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}"
 B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}"
 
 #EXTRA_OECONF_BASE = "  --enable-cheaders=c_std \