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 compilation error when building OpenSSL 1.1.1q in MacOS 11+ for 3.9.15 and 3.8.15 #2520

Merged
merged 2 commits into from
Nov 13, 2022

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Nov 8, 2022

Make sure you have checked all steps below.

Prerequisite

  • Please consider implementing the feature as a hook script or plugin as a first step.
    • pyenv has some powerful support for plugins and hook scripts. Please refer to Authoring plugins for details and try to implement it as a plugin if possible.
  • Please consider contributing the patch upstream to rbenv, since we have borrowed most of the code from that project.
    • We occasionally import the changes from rbenv. In general, you can expect changes made in rbenv will be imported to pyenv too, eventually.
    • Generally speaking, we prefer not to make changes in the core in order to keep compatibility with rbenv.
  • My PR addresses the following pyenv issue (if any)

Description

  • Here are some details about my PR
    Python updated openssl to version 1.1.1q in 3.8.15, 3.9.15 and 3.11. Python 3.10.7 is at 1.1.1o.
    The following PR added a patch for building openssl 1.1.1q on 3.11 but not for 3.8.15 and 3.9.15.
    Fix compilation error when building OpenSSL 1.1.1q in MacOS 11+ #2500
    This applies the openssl 1.1.1q patches to the 3.8.15 and 3.9.15 builds of python.

Tests

  • My PR adds the following unit tests (if any)
    N/A

@@ -8,3 +8,5 @@
/src/*.o
/bats/
/default-packages
.idea
*.un~
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.idea is a directory created by pycharm
*.un~ is a lockfile created by vim

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extending project's .gitignore with personal OS/tooling-related files and paths is usually not recommended practice.
Especially in this exact case, it is totally unrelated to the patch you are providing.

I suggest you configuring global .gitignore file for your workstation:
https://adamj.eu/tech/2022/11/06/git-set-up-a-global-ignore-file/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think IDEA/Pycharm and Vim are used widely enough to warrant adding.

It's okay to address additional concerns in a PR (as long as it's within reason, of course), but then each concern needs to be in its own commit (see the contribution giude).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@twangboy Could you please restructure the commits as per the contribution giude, or move the gitignore part to another PR?

@native-api native-api force-pushed the fix_3.9.15 branch 2 times, most recently from aa244bf to 70141e3 Compare November 13, 2022 01:28
@native-api native-api merged commit 0b6320d into pyenv:master Nov 13, 2022
@native-api native-api changed the title Patch openssl 1.1.1q on macos for Python 3.8.15 and 3.9.15 Fix compilation error when building OpenSSL 1.1.1q in MacOS 11+ for 3.9.15 and 3.8.15 Nov 13, 2022
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.

None yet

3 participants