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 bzip2 makefile_take_env_vars.patch for 1.0.8 patching #1199

Closed
wants to merge 4 commits into from
Closed

Fix bzip2 makefile_take_env_vars.patch for 1.0.8 patching #1199

wants to merge 4 commits into from

Conversation

Quantu
Copy link

@Quantu Quantu commented May 8, 2020

makefile_take_env_vars.patch fails to apply to Makefile on 1.0.8. Increase context so patch works for bzip2-1.0.8.
Fixes #1173

Obvious fix.

Description

Related Issue

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Chore (non-breaking change that does not add functionality or fix an issue)

Checklist:

  • I have read the CONTRIBUTING document.
  • I have run the pre-merge tests locally and they pass.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commits have been signed-off for the Developer Certificate of Origin.

makefile_take_env_vars.patch should only be applied if bzip2 version is 1.0.6. Patch fails to apply on 1.0.8.

Obvious fix.
@Quantu Quantu requested review from a team as code owners May 8, 2020 16:14
@Quantu Quantu changed the title Fix bzip2 version patching logic Fix bzip2-1.0.8 makefile_take_env_vars.patch for 1.0.8 patching May 19, 2020
@Quantu Quantu changed the title Fix bzip2-1.0.8 makefile_take_env_vars.patch for 1.0.8 patching Fix bzip2 makefile_take_env_vars.patch for 1.0.8 patching May 19, 2020
@Quantu
Copy link
Author

Quantu commented May 27, 2020

The issue is with the version of patch preinstalled on macos (even through 10.15.5 at least, doubt they will every update it). brew install gpatch and it works fine as-is.

@Quantu Quantu closed this May 27, 2020
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.

Regression of #1040: cannot compile on macOS - bzip2
1 participant