[oe] gcc-cross-initial patching fails

2012-02-22 Thread Andreas Müller
At build from scratch I get

ERROR: Command Error: exit status: 1  Output:
Applying patch gcc45-no-add-needed.patch
patching file gcc/config/alpha/elf.h
patching file gcc/config/ia64/linux.h
patching file gcc/config/linux.h
Hunk #1 succeeded at 89 (offset -12 lines).
patching file gcc/config/rs6000/sysv4.h
Hunk #1 FAILED at 908.
1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
/home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
ERROR: Task 2829
(/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
do_patch) failed with exit code '1'

git log does not help me much -  what goes wrong?

Andreas

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-22 Thread McClintock Matthew-B29882
On Wed, Feb 22, 2012 at 2:13 PM, Andreas Müller
 wrote:
> At build from scratch I get
>
> ERROR: Command Error: exit status: 1  Output:
> Applying patch gcc45-no-add-needed.patch
> patching file gcc/config/alpha/elf.h
> patching file gcc/config/ia64/linux.h
> patching file gcc/config/linux.h
> Hunk #1 succeeded at 89 (offset -12 lines).
> patching file gcc/config/rs6000/sysv4.h
> Hunk #1 FAILED at 908.
> 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
> Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored in:
> /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
> NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
> ERROR: Task 2829
> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
> do_patch) failed with exit code '1'
>
> git log does not help me much -  what goes wrong?

Which actual patch is it failing on? Is there a conflict between
oe-core and meta-oe patch set against gcc?

-M

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-22 Thread Andreas Müller
On Wed, Feb 22, 2012 at 9:13 PM, Andreas Müller
 wrote:
> At build from scratch I get
>
> ERROR: Command Error: exit status: 1  Output:
> Applying patch gcc45-no-add-needed.patch
> patching file gcc/config/alpha/elf.h
> patching file gcc/config/ia64/linux.h
> patching file gcc/config/linux.h
> Hunk #1 succeeded at 89 (offset -12 lines).
> patching file gcc/config/rs6000/sysv4.h
> Hunk #1 FAILED at 908.
> 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
> Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored in:
> /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
> NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
> ERROR: Task 2829
> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
> do_patch) failed with exit code '1'
>
> git log does not help me much -  what goes wrong?
>
After looking around a bit I think this one is better on oe-core list.
Maybe it is related to the last two patches:

commit 6546096d068b51cc9cf4557cdb35aee6f62838d5
Author: Lianhao Lu 
Date:   Tue Feb 14 10:57:52 2012 +0800

gcc: Excluding the DATE/SRCDATE from do_patch dependency.

Corrected the error introduced by commit afb400e of dropping
DATE/SRCDATE out of the vardepsexlude list of do_patch.

Signed-off-by: Lianhao Lu 

diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index 57668f9..df6021a 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -109,4 +109,4 @@ do_headerfix[vardepvalue] = "PATH"
 # We need to ensure that for the shared work directory, the do_patch
singatures match
 # The real WORKDIR location isn't a dependency for the shared workdir.
 src_patches[vardepsexclude] = "WORKDIR"
-should_apply[vardepsexclude] = "PN"
+should_apply[vardepsexclude] += "PN"

commit afb400e9c3ddac604906bde44df5da29a6c134d9
Author: Lianhao Lu 
Date:   Fri Feb 10 11:42:18 2012 +0800

gcc: Ensure same sstate hashes for shared soruce directory

Ensure do_patch have the same sstate hashes for nativesdk variants of
gcc family recipes, since they share the same source directory.

Signed-off-by: Lianhao Lu 

diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index e89a7c0..57668f9 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -109,3 +109,4 @@ do_headerfix[vardepvalue] = "PATH"
 # We need to ensure that for the shared work directory, the do_patch
singatures match
 # The real WORKDIR location isn't a dependency for the shared workdir.
 src_patches[vardepsexclude] = "WORKDIR"
+should_apply[vardepsexclude] = "PN"

Andreas

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-22 Thread Khem Raj
On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
 wrote:
>> Applying patch gcc45-no-add-needed.patch
>> patching file gcc/config/alpha/elf.h
>> patching file gcc/config/ia64/linux.h
>> patching file gcc/config/linux.h
>> Hunk #1 succeeded at 89 (offset -12 lines).
>> patching file gcc/config/rs6000/sysv4.h
>> Hunk #1 FAILED at 908.
>> 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
>> Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
>> ERROR: Function failed: patch_do_patch
>> ERROR: Logfile of failure stored in:
>> /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
>> NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
>> ERROR: Task 2829
>> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
>> do_patch) failed with exit code '1'
>>
>> git log does not help me much -  what goes wrong?
>
> Which actual patch is it failing on? Is there a conflict between
> oe-core and meta-oe patch set against gcc?

gcc45-no-add-needed.patch is the patch in question. I dont see
anything wrong with it.
Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake
gcc-cross-initial -cpatch ?

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-22 Thread Gary Thomas

On 2012-02-22 14:18, Khem Raj wrote:

On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
  wrote:

Applying patch gcc45-no-add-needed.patch
patching file gcc/config/alpha/elf.h
patching file gcc/config/ia64/linux.h
patching file gcc/config/linux.h
Hunk #1 succeeded at 89 (offset -12 lines).
patching file gcc/config/rs6000/sysv4.h
Hunk #1 FAILED at 908.
1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
/home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
ERROR: Task 2829
(/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
do_patch) failed with exit code '1'

git log does not help me much -  what goes wrong?


Which actual patch is it failing on? Is there a conflict between
oe-core and meta-oe patch set against gcc?


gcc45-no-add-needed.patch is the patch in question. I dont see
anything wrong with it.
Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake
gcc-cross-initial -cpatch ?


I saw this as well after updating today but not a totally clean build tree.
I'm building now totally from scratch (no build tree) and it seems
to no longer have the issue.

--

Gary Thomas |  Consulting for the
MLB Associates  |Embedded world


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-22 Thread Andreas Müller
On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj  wrote:
> On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
>  wrote:
>>> Applying patch gcc45-no-add-needed.patch
>>> patching file gcc/config/alpha/elf.h
>>> patching file gcc/config/ia64/linux.h
>>> patching file gcc/config/linux.h
>>> Hunk #1 succeeded at 89 (offset -12 lines).
>>> patching file gcc/config/rs6000/sysv4.h
>>> Hunk #1 FAILED at 908.
>>> 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
>>> Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
>>> ERROR: Function failed: patch_do_patch
>>> ERROR: Logfile of failure stored in:
>>> /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
>>> NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
>>> ERROR: Task 2829
>>> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
>>> do_patch) failed with exit code '1'
>>>
>>> git log does not help me much -  what goes wrong?
>>
>> Which actual patch is it failing on? Is there a conflict between
>> oe-core and meta-oe patch set against gcc?
>
> gcc45-no-add-needed.patch is the patch in question. I dont see
> anything wrong with it.
> Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake
> gcc-cross-initial -cpatch ?
>
FYI: I removed the line which came in by the commits I mentioned above

should_apply[vardepsexclude] += "PN"

in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc

and build from scratch works without issues.

Andreas

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-23 Thread Andreas Müller
On Wed, Feb 22, 2012 at 10:39 PM, Andreas Müller
 wrote:
> On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj  wrote:
>> On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
>>  wrote:
 Applying patch gcc45-no-add-needed.patch
 patching file gcc/config/alpha/elf.h
 patching file gcc/config/ia64/linux.h
 patching file gcc/config/linux.h
 Hunk #1 succeeded at 89 (offset -12 lines).
 patching file gcc/config/rs6000/sysv4.h
 Hunk #1 FAILED at 908.
 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
 Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
 ERROR: Function failed: patch_do_patch
 ERROR: Logfile of failure stored in:
 /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
 NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
 ERROR: Task 2829
 (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
 do_patch) failed with exit code '1'

 git log does not help me much -  what goes wrong?
>>>
>>> Which actual patch is it failing on? Is there a conflict between
>>> oe-core and meta-oe patch set against gcc?
>>
>> gcc45-no-add-needed.patch is the patch in question. I dont see
>> anything wrong with it.
>> Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake
>> gcc-cross-initial -cpatch ?
>>
> FYI: I removed the line which came in by the commits I mentioned above
>
> should_apply[vardepsexclude] += "PN"
>
> in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc
>
> and build from scratch works without issues.
>
Strange: On my other build machine the described error does not occur...

Andreas

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] gcc-cross-initial patching fails

2012-02-23 Thread Andreas Müller
On Thu, Feb 23, 2012 at 11:11 AM, Andreas Müller
 wrote:
> On Wed, Feb 22, 2012 at 10:39 PM, Andreas Müller
>  wrote:
>> On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj  wrote:
>>> On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
>>>  wrote:
> Applying patch gcc45-no-add-needed.patch
> patching file gcc/config/alpha/elf.h
> patching file gcc/config/ia64/linux.h
> patching file gcc/config/linux.h
> Hunk #1 succeeded at 89 (offset -12 lines).
> patching file gcc/config/rs6000/sysv4.h
> Hunk #1 FAILED at 908.
> 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h
> Patch gcc45-no-add-needed.patch does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored in:
> /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367
> NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed
> ERROR: Task 2829
> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb,
> do_patch) failed with exit code '1'
>
> git log does not help me much -  what goes wrong?

 Which actual patch is it failing on? Is there a conflict between
 oe-core and meta-oe patch set against gcc?
>>>
>>> gcc45-no-add-needed.patch is the patch in question. I dont see
>>> anything wrong with it.
>>> Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake
>>> gcc-cross-initial -cpatch ?
>>>
>> FYI: I removed the line which came in by the commits I mentioned above
>>
>> should_apply[vardepsexclude] += "PN"
>>
>> in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc
>>
>> and build from scratch works without issues.
>>
> Strange: On my other build machine the described error does not occur...
>
Sorry for the noise but now also this machine seems affected:

Applying patch gcc-4.5-linaro-r99502.patch
patching file gcc/combine.c
Hunk #1 succeeded at 2928 (offset -11 lines).
Hunk #2 FAILED at 2964.
1 out of 2 hunks FAILED -- rejects in file gcc/combine.c
patching file gcc/simplify-rtx.c
Hunk #1 succeeded at 2417 (offset 4 lines).
patching file gcc/testsuite/gcc.target/arm/unsigned-extend-1.c
patching file gcc/testsuite/gcc.target/arm/xor-and.c
Patch gcc-4.5-linaro-r99502.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch

This time it could not be fixed by

should_apply[vardepsexclude] += "PN"

in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc

as mentioned above. Seems being sporadic issue only causing fallout on
my machines...

Andreas

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel