[oe] gcc-cross-initial patching fails

[Andreas Müller]

On Thu, Feb 23, 2012 at 11:11 AM, Andreas Müller
<schnitzeltony at googlemail.com> wrote:
> On Wed, Feb 22, 2012 at 10:39 PM, Andreas Müller
> <schnitzeltony at googlemail.com> wrote:
>> On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj <raj.khem at gmail.com> wrote:
>>> On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882
>>> <B29882 at freescale.com> 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