programs/platform.h has already been patched by upstream and now will be patched twice with the same lines, thus the note: Hunk #1 succeeded at 108 with fuzz 1 (offset 6 lines). it doesn't seem to break the compile anywhere, but the patch should be removed from 1.4.8 anyway.
ccing sam, cause you merged the pr with the patch back then.
Good spot, I’ll drop it later (thanks for CC)
I've tested with uclibc, 1.4.8 is fully working now without the patch. And it doesn't choke up with the "double" patch.
Maybe also rename this bug from 1.48 to 1.4.8. >>> Unpacking source... >>> Unpacking zstd-1.4.8.tar.gz to /var/tmp/portage/app-arch/zstd-1.4.8/work >>> Source unpacked in /var/tmp/portage/app-arch/zstd-1.4.8/work >>> Preparing source in /var/tmp/portage/app-arch/zstd-1.4.8/work/zstd-1.4.8 ... * Applying zstd-1.4.5-fix-uclibc-ng.patch ... patching file programs/platform.h Hunk #1 succeeded at 108 with fuzz 1 (offset 6 lines). [ ok ] * Will copy sources from /var/tmp/portage/app-arch/zstd-1.4.8/work/zstd-1.4.8 * abi_x86_64.amd64: copying to /var/tmp/portage/app-arch/zstd-1.4.8/work/zstd-1.4.8-abi_x86_64.amd64 >>> Source prepared. * Applying zstd-1.4.5-multi-thread-default.patch ... patching file programs/zstdcli.c Hunk #1 FAILED at 695. 1 out of 1 hunk FAILED -- saving rejects to file programs/zstdcli.c.rej patching file programs/README.md Hunk #1 FAILED at 168. 1 out of 1 hunk FAILED -- saving rejects to file programs/README.md.rej patching file programs/zstdcli.c Hunk #1 succeeded at 179 (offset 19 lines). [ !! ] * ERROR: app-arch/zstd-1.4.8::gentoo failed (configure phase):
Dropping now.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5205c3c53de333600f99fcd255f494c795d37b6a commit 5205c3c53de333600f99fcd255f494c795d37b6a Author: Sam James <sam@gentoo.org> AuthorDate: 2020-12-22 23:47:46 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2020-12-22 23:47:55 +0000 app-arch/zstd: drop upstreamed/irrelevant patch Revbumping because the patch still applies successfully and could have runtime effects (let's be cautious). Closes: https://bugs.gentoo.org/761121 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Sam James <sam@gentoo.org> app-arch/zstd/{zstd-1.4.8.ebuild => zstd-1.4.8-r1.ebuild} | 4 ---- 1 file changed, 4 deletions(-)
