Bug 876877 – sys-devel/clang-15.0.3.9999 merge (patch) fails

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description brankob 2022-10-12 18:12:05 UTC]

patches that fails are part of LLVM_PATCHSET.
Failing patches are 0006*, 0008*, and 0009*

Reproducible: Always

Steps to Reproduce:
1. emerge -1 =sys-devel/clang-15.0.3.9999
2.
3.
Actual Results:  
*   0006-clang-tools-extra-clangd-Respect-llvm_shlib_dir-in-t.patch ...
patching file clang-tools-extra/clangd/test/lit.site.cfg.py.in
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file clang-tools-extra/clangd/test/lit.site.cfg.py.in.rej
 [ !! ]

[Comment 1 brankob 2022-10-12 20:22:03 UTC]

At a second glance, it seems that failing patches are also redundant - something that was already applied in current branch or implemented in a bit different manner.

For a temporary solution, I've recreated the patchset without patches 0006,0008 and 0009...

[Comment 2 Sam James 2022-10-12 20:31:10 UTC]

It sounds like upstream indeed backported them, yay.

[Comment 3 Michał Górny 2022-10-13 05:04:56 UTC]

Thanks for the report.  Unfortunately, that's the cost of maintaining non-upstreamable patches.

[Comment 4 Larry the Git Cow 2022-10-13 05:06:29 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cce8bfcdd508e93d06a5b467c991a02228b1a0

commit 84cce8bfcdd508e93d06a5b467c991a02228b1a0
Author:     Michał Górny <[e-mail]>
AuthorDate: 2022-10-13 05:04:35 +0000
Commit:     Michał Górny <[e-mail]>
CommitDate: 2022-10-13 05:06:25 +0000

    sys-devel/clang: Rebase the patchset for 15.0.3.9999
    
    Closes: https://bugs.gentoo.org/876877
    Signed-off-by: Michał Górny <[e-mail]>

 sys-devel/clang/Manifest                 | 2 +-
 sys-devel/clang/clang-15.0.3.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)