Skip to content

pcre2: backport jit auto-detection#300565

Merged
marsam merged 1 commit intoNixOS:stagingfrom
trofi:pcre2-fix-jit
Apr 6, 2024
Merged

pcre2: backport jit auto-detection#300565
marsam merged 1 commit intoNixOS:stagingfrom
trofi:pcre2-fix-jit

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Mar 31, 2024

Without the change pcre2 build without jit support. This happens because --wit-jit=auto was broken in this release. THe change backports upstream fix.

Before the change ./configure log:

pcre2>     Enable JIT compiling support ....... : no

After the change:

pcre2>     Enable JIT compiling support ....... : yes

I initially observed the failures on rizin as a spam of failures to JIT a trivial regex:

$ rizin
ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
...
ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
 -- Check your IO plugins with 'rizin -L'
[0x00000000]>

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Without the change `pcre2` build without `jit` support. This happens
because --wit-jit=auto was broken in this release. THe change backports
upstream fix.

Before the change ./configure log:

    pcre2>     Enable JIT compiling support ....... : no

After the change:

    pcre2>     Enable JIT compiling support ....... : yes

I initially observed the failures on `rizin` as a spam of failures to
JIT a trivial regex:

    $ rizin
    ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
    ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
    ...
    ERROR: Regex compilation for '\s+' failed at 0: bad JIT option
     -- Check your IO plugins with 'rizin -L'
    [0x00000000]>
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Mar 31, 2024
@ofborg ofborg bot requested a review from ttuegel March 31, 2024 23:55
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 31, 2024
@marsam marsam linked an issue Apr 1, 2024 that may be closed by this pull request
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 1, 2024
@marsam marsam merged commit 9a92af3 into NixOS:staging Apr 6, 2024
@trofi trofi deleted the pcre2-fix-jit branch April 6, 2024 05:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

pcre2: JIT not enabled in 10.43

3 participants