Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 809416 - sys-devel/make declares EAPI=7 but does not fully respect user patches
Summary: sys-devel/make declares EAPI=7 but does not fully respect user patches
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2021-08-21 15:43 UTC by Alexander Bezrukov
Modified: 2022-04-29 11:30 UTC (History)
3 users (show)

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


Attachments
The patch to fix make-4.3.ebuild in order to respect user patches. (make-4.3.patch,1.37 KB, patch)
2021-08-21 15:43 UTC, Alexander Bezrukov
Details | Diff
The patch to fix make-4.3.ebuild in order to respect user patches. (make-4.3.patch,1.35 KB, patch)
2021-08-21 15:54 UTC, Alexander Bezrukov
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alexander Bezrukov 2021-08-21 15:43:59 UTC
Created attachment 734905 [details, diff]
The patch to fix make-4.3.ebuild in order to respect user patches.

The current make-4.3 is broken with respect to $PATH handling. This has brought me to gdb to find out the culprit and prepare a patch. It turned out, this issue is known and fixed upstream [0] but the fix is not yet released.

The src_prepare() function in ebuild changes directory from $S to $S/src but not all sources are contained within this directory. This makes it impossibly to patch the gnulib part of make.

I am attaching a patch which fixes the issue (the issue of not respecting user patches, not the original one with $PATH handling).

PS: By the way, it may be worthful to pull the fix for $PATH-handling issue too because the breakage is cryptic and takes quite an amount of head scraping, especially if build system is sophisticated as it was in my case.

[0] https://savannah.gnu.org/bugs/index.php?57962
Comment 1 Alexander Bezrukov 2021-08-21 15:54:09 UTC
Created attachment 734908 [details, diff]
The patch to fix make-4.3.ebuild in order to respect user patches.

A cosmetic change: removed src_prepare() altogether
Comment 2 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2022-04-29 06:12:39 UTC
Thanks. I'd include the gnulib patch but it's not clear which we need.
Comment 3 Larry the Git Cow gentoo-dev 2022-04-29 06:12:53 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f57d1e86732ff5160de52e92584363cc0e256cb

commit 2f57d1e86732ff5160de52e92584363cc0e256cb
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2022-04-29 06:08:10 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-04-29 06:12:46 +0000

    sys-devel/make: rebase patch paths
    
    Allows patching gnulib.
    
    Closes: https://bugs.gentoo.org/809416
    Signed-off-by: Sam James <sam@gentoo.org>

 sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch | 4 ++--
 sys-devel/make/files/make-4.2-default-cxx.patch                  | 6 ++----
 sys-devel/make/make-4.3.ebuild                                   | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)
Comment 4 Alexander Bezrukov 2022-04-29 11:30:20 UTC
(In reply to Sam James from comment #2)
> Thanks. I'd include the gnulib patch but it's not clear which we need.

The upsteam fix is available here:
https://savannah.gnu.org/bugs/index.php?57962#comment4