Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 929025 - app-arch/7zip: S=CPP/7zip makes it hard to user-patch
Summary: app-arch/7zip: S=CPP/7zip makes it hard to user-patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: NRK
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2024-04-09 20:56 UTC by Michael Orlitzky
Modified: 2024-04-14 16:05 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Orlitzky gentoo-dev 2024-04-09 20:56:16 UTC
I have a patch that makes p7zip support POSIX acls, and I'm trying to port it to 7zip. But I need to patch something in CPP/Windows, so having S=CPP/7zip is giving me trouble.

Would it be possible to set $S _after_ the call to the default src_prepare?
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-04-09 21:01:19 UTC
If the build of 7zip is using code from CPP/Windows and it's not a matter of your patch just dropping useless hunks, then it's OK with me, but give it a day or two to see what NRK & arthur say. Thanks!
Comment 2 Michael Orlitzky gentoo-dev 2024-04-09 21:03:58 UTC
(In reply to Sam James from comment #1)
> If the build of 7zip is using code from CPP/Windows and it's not a matter of
> your patch just dropping useless hunks, then it's OK with me, but give it a
> day or two to see what NRK & arthur say. Thanks!

It does. Just like how the clang makefile runs makefile.gcc, the linux build has its sources under Windows/.

At least it's consistent.
Comment 3 NRK 2024-04-09 21:24:10 UTC
I actually considered doing S="${WORKDIR}" due to awkwardness like this...

	pushd "${WORKDIR}" || die "Unable to switch directory"
	einstalldocs

... and the fact that src_compile() has to do pushd+popd anyways.

But I didn't touch `S` mainly because I didn't think it was worthwhile (and also out of laziness). But if it's causing headache for user patches, then changing is okay by me.
Comment 4 Larry the Git Cow gentoo-dev 2024-04-13 06:13:45 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d68b319a21d850d0080ac3c17a1d498bc224ac0

commit 8d68b319a21d850d0080ac3c17a1d498bc224ac0
Author:     NRK <nrk@disroot.org>
AuthorDate: 2024-04-13 00:16:56 +0000
Commit:     Arthur Zamarin <arthurzam@gentoo.org>
CommitDate: 2024-04-13 06:13:37 +0000

    app-arch/7zip: fix #929025, add some comments
    
    Closes: https://bugs.gentoo.org/929025
    Signed-off-by: NRK <nrk@disroot.org>
    Closes: https://github.com/gentoo/gentoo/pull/36230
    Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild                        | 16 ++++++++--------
 app-arch/7zip/files/7zip-23.01-respect-build-env.patch |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
Comment 5 Michael Orlitzky gentoo-dev 2024-04-14 16:05:47 UTC
That helped, thank you!