coreutils 8.32: src/patches/coreutils-8.27-i18n-1.patch causes build error

coreutils 8.32: src/patches/coreutils-8.27-i18n-1.patch causes build error

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2259 bytes --]

Hello *,

src/patches/coreutils-8.27-i18n-1.patch does not fully apply anymore on uniq.c in coreutils 8.32.
Since this is beyond my scope (and I did not fully understand what the author did her in 2012): Could
somebody else have a look at this? Do we even need this patch anymore?

> coreutils (8.32)                                                                                                                         [        0 ][ FAIL ]
> 
>     Hunk #6 succeeded at 385 (offset -7 lines).
>     Hunk #7 FAILED at 401.
>     Hunk #8 succeeded at 461 (offset -12 lines).
>     Hunk #9 succeeded at 510 (offset -12 lines).
>     Hunk #10 succeeded at 526 (offset -12 lines).
>     Hunk #11 succeeded at 554 (offset -12 lines).
>     Hunk #12 succeeded at 594 (offset -12 lines).
>     Hunk #13 succeeded at 642 (offset -13 lines).
>     1 out of 13 hunks FAILED -- saving rejects to file src/uniq.c.rej
>     patching file tests/expand/mb.sh
>     patching file tests/i18n/sort.sh
>     patching file tests/local.mk
>     Hunk #1 succeeded at 369 (offset 17 lines).
>     Hunk #2 succeeded at 569 (offset 23 lines).
>     Hunk #3 succeeded at 717 (offset 30 lines).
>     patching file tests/misc/cut.pl
>     patching file tests/misc/expand.pl
>     Hunk #2 succeeded at 177 with fuzz 1 (offset 16 lines).
>     Hunk #3 succeeded at 195 (offset 16 lines).
>     patching file tests/misc/fold.pl
>     patching file tests/misc/join.pl
>     Hunk #2 succeeded at 342 (offset 4 lines).
>     patching file tests/misc/sort-mb-tests.sh
>     patching file tests/misc/sort-merge.pl
>     patching file tests/misc/sort.pl
>     patching file tests/misc/unexpand.pl
>     patching file tests/misc/uniq.pl
>     patching file tests/pr/pr-tests.pl
>     patching file tests/unexpand/mb.sh
>     make: *** [coreutils:97: /usr/src/log/coreutils-8.32] Error 1
> 
> ERROR: Building coreutils                                                                                                                            [ FAIL ]
>     Check /home/fluke/devel/IPFire-development/ipfire-2.x/log/_build.base.log for errors if applicable                                               [ FAIL ]

Thanks, and best regards,
Peter Müller

Re: coreutils 8.32: src/patches/coreutils-8.27-i18n-1.patch causes build error

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2468 bytes --]

Does this one work?

http://www.linuxfromscratch.org/patches/lfs/9.1/coreutils-8.31-i18n-1.patch

> On 11 Apr 2020, at 16:12, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Hello *,
> 
> src/patches/coreutils-8.27-i18n-1.patch does not fully apply anymore on uniq.c in coreutils 8.32.
> Since this is beyond my scope (and I did not fully understand what the author did her in 2012): Could
> somebody else have a look at this? Do we even need this patch anymore?
> 
>> coreutils (8.32)                                                                                                                         [        0 ][ FAIL ]
>> 
>>    Hunk #6 succeeded at 385 (offset -7 lines).
>>    Hunk #7 FAILED at 401.
>>    Hunk #8 succeeded at 461 (offset -12 lines).
>>    Hunk #9 succeeded at 510 (offset -12 lines).
>>    Hunk #10 succeeded at 526 (offset -12 lines).
>>    Hunk #11 succeeded at 554 (offset -12 lines).
>>    Hunk #12 succeeded at 594 (offset -12 lines).
>>    Hunk #13 succeeded at 642 (offset -13 lines).
>>    1 out of 13 hunks FAILED -- saving rejects to file src/uniq.c.rej
>>    patching file tests/expand/mb.sh
>>    patching file tests/i18n/sort.sh
>>    patching file tests/local.mk
>>    Hunk #1 succeeded at 369 (offset 17 lines).
>>    Hunk #2 succeeded at 569 (offset 23 lines).
>>    Hunk #3 succeeded at 717 (offset 30 lines).
>>    patching file tests/misc/cut.pl
>>    patching file tests/misc/expand.pl
>>    Hunk #2 succeeded at 177 with fuzz 1 (offset 16 lines).
>>    Hunk #3 succeeded at 195 (offset 16 lines).
>>    patching file tests/misc/fold.pl
>>    patching file tests/misc/join.pl
>>    Hunk #2 succeeded at 342 (offset 4 lines).
>>    patching file tests/misc/sort-mb-tests.sh
>>    patching file tests/misc/sort-merge.pl
>>    patching file tests/misc/sort.pl
>>    patching file tests/misc/unexpand.pl
>>    patching file tests/misc/uniq.pl
>>    patching file tests/pr/pr-tests.pl
>>    patching file tests/unexpand/mb.sh
>>    make: *** [coreutils:97: /usr/src/log/coreutils-8.32] Error 1
>> 
>> ERROR: Building coreutils                                                                                                                            [ FAIL ]
>>    Check /home/fluke/devel/IPFire-development/ipfire-2.x/log/_build.base.log for errors if applicable                                               [ FAIL ]
> 
> Thanks, and best regards,
> Peter Müller