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

Update contrib/relic to upstream 94154a8b77e1+https://github.com/relic-toolkit/relic/pull/88 #33

Merged
merged 2 commits into from
Sep 27, 2018

Conversation

codablock
Copy link
Contributor

This includes:

  1. Replace WORD and FIXED with WSIZE and FIXWI relic-toolkit/relic#86
  2. Check for not set WSIZE and set WORD before setting WSIZE to defaults relic-toolkit/relic#88
  3. relic-toolkit/relic@80978be
  4. relic-toolkit/relic@8748a1f
  5. relic-toolkit/relic@49857e5
  6. relic-toolkit/relic@d56ce03

If relic-toolkit/relic#88 gets merged in before this PR, I'll update the PR accordingly.

I did this update manually by copying the latest relic sources into contrib/relic and then picking the changes into git. I hope I didn't make any errors, especially in regard to the changes that were performed in parallel in this repository. Please review.

In the future, I'd suggest to perform such updates by creating a patch inside the relic repository:

$ git diff 94154a8b77e1 master

and then applying that patch to contrib/relic. The commit message should then include the commit id of relic's master so that next time you know which version to diff against.

@mariano54
Copy link
Contributor

excellent thanks, I was going to do the same thing

@mariano54 mariano54 merged commit c6dad5c into Chia-Network:master Sep 27, 2018
@codablock codablock deleted the pr_update_relic branch September 27, 2018 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants