Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): fix the building failure when applying patches #11696

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Conversation

zhongweiy
Copy link
Contributor

@zhongweiy zhongweiy commented Oct 4, 2023

When openresty patch applying order matters, some patch applying fails. Fix it by sorting.

There are 2 patches in the Openresty LuaJIT patches directory that have dependency:

  1. LuaJIT-2.1-20230410_03_arm64_sigill.patch
  2. LuaJIT-2.1-20230410_07_ldp_stp_unaligned.patch

2 depends on 1. And the current bazel build applying the patch in a non-deterministic order and sometime, it can run to build error if 2 is applied first. Fix it by sorting the patch.

Summary

Checklist

Full changelog

Issue reference

Fix #KAG-2712

When openresty patch applying order matters, some patch applying
fails. Fix it by sorting.
@locao locao merged commit e373295 into master Oct 5, 2023
25 checks passed
@locao locao deleted the fix_patch branch October 5, 2023 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants