Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 776682 - dev-vcs/git: drop dev-libs/libpcre2[jit] requirement
Summary: dev-vcs/git: drop dev-libs/libpcre2[jit] requirement
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Robin Johnson
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2021-03-16 15:04 UTC by Sam James
Modified: 2021-04-14 09:55 UTC (History)
2 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 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-03-16 15:04:03 UTC
I checked out the source and it appears to fall back fine when libpcre2 is built without JIT.

* Tested on SPARC (tests pass except one unrelated failure, git grep -P works);

* Tested on amd64 with USE=jit flipped on libpcre2 both ways without recompiling git once compiled against a certain state, to ensure no ABI breakage occurs (none, as expected due to the pcre2_config call)

So, we can change the dependency in git to dev-libs/libpcre2 and drop the JIT masks: https://github.com/gentoo/gentoo/commit/c77f3ab0d1692784b1b56cee0ef0805ed81f7d42.
Comment 1 Larry the Git Cow gentoo-dev 2021-03-18 09:21:39 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1e20adccf8f3dd8476d64e33ac1eba494b858b

commit 1c1e20adccf8f3dd8476d64e33ac1eba494b858b
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2021-03-16 15:22:55 +0000
Commit:     Lars Wendler <polynomial-c@gentoo.org>
CommitDate: 2021-03-18 09:21:13 +0000

    profiles/arch: drop obsolete dev-vcs/git[pcre] masks
    
    It turns out that dev-vcs/git[pcre] doesn't need
    dev-libs/libpcre2[jit], just libpcre2 itself.
    
    Closes: https://bugs.gentoo.org/776682
    Signed-off-by: Sam James <sam@gentoo.org>
    Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

 profiles/arch/alpha/package.use.mask      | 1 -
 profiles/arch/hppa/package.use.mask       | 1 -
 profiles/arch/ia64/package.use.mask       | 1 -
 profiles/arch/riscv/package.use.mask      | 1 -
 profiles/arch/sparc/64ul/package.use.mask | 1 -
 5 files changed, 5 deletions(-)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452a99dc3ec82c3485993a2de5de8d453f6adc24

commit 452a99dc3ec82c3485993a2de5de8d453f6adc24
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2021-03-16 15:20:55 +0000
Commit:     Lars Wendler <polynomial-c@gentoo.org>
CommitDate: 2021-03-18 09:21:12 +0000

    dev-vcs/git: don't require JIT on dev-libs/libpcre2
    
    Git detects at runtime whether JIT was compiled in to libpcre2
    and falls back gracefully if it wasn't.
    
    Bug: https://bugs.gentoo.org/776682
    Signed-off-by: Sam James <sam@gentoo.org>
    Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

 dev-vcs/git/{git-2.31.0.ebuild => git-2.31.0-r1.ebuild} | 2 +-
 dev-vcs/git/git-9999-r1.ebuild                          | 2 +-
 dev-vcs/git/git-9999-r2.ebuild                          | 2 +-
 dev-vcs/git/git-9999-r3.ebuild                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)