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.

Sign up for GitHub

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

Jump to bottom

gh-127897: fix HACL* build on macOS/Catalina #127932

Merged
merged 1 commit into from
Dec 18, 2024
Merged

gh-127897: fix HACL* build on macOS/Catalina #127932

merged 1 commit into from
Dec 18, 2024

Conversation

aeiouaeiouaeiouaeiouaeiouaeiou
Copy link
Contributor

@aeiouaeiouaeiouaeiouaeiouaeiou aeiouaeiouaeiouaeiouaeiouaeiou commented Dec 13, 2024 •
edited by bedevere-app bot
Loading

@cpython-cla-bot CPython CLA Bot
Copy link

cpython-cla-bot bot commented Dec 13, 2024 •
edited
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app
Copy link

bedevere-app bot commented Dec 13, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@bedevere-app bedevere-app bot mentioned this pull request Dec 13, 2024
Closed
@aeiouaeiouaeiouaeiouaeiouaeiou
Copy link
Contributor Author

Looks like I must update folder using ./refresh script instead. Also, I'm waiting for that PR to be reviewed.

@aeiouaeiouaeiouaeiouaeiouaeiou aeiouaeiouaeiouaeiouaeiouaeiou marked this pull request as draft December 14, 2024 04:07
@picnixz picnixz self-requested a review December 14, 2024 10:05
@picnixz
Copy link
Member

picnixz commented Dec 14, 2024

FTR: we don't change the contents of _hacl except via the refresh.sh script so you do need to first update that one. In addition, do not forget to update Misc/sbom.spdx.json.

@aeiouaeiouaeiouaeiouaeiouaeiou
Copy link
Contributor Author

aeiouaeiouaeiouaeiouaeiouaeiou commented Dec 14, 2024 •
edited
Loading

The hacl-star repository does not contain the updated KaRaMeL headers, as it too is manually synchronized. 🤷‍♂️
@msprotz can we make changes to finalize this pull request?

@aeiouaeiouaeiouaeiouaeiouaeiou
Copy link
Contributor Author

The updates have been successfully collected: hacl-star/hacl-star#1010

@msprotz
Copy link
Contributor

msprotz commented Dec 17, 2024

As you noticed, the refresh is automated via CI -- I've approved the PR and the updated file is now in main. Thanks again!

@bedevere-app
Copy link

bedevere-app bot commented Dec 18, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@aeiouaeiouaeiouaeiouaeiouaeiou
gh-127897: Update HACL* module
0ae8930 
- Lib_Memzero0.c: don't use memset_s() on macOS <10.9
- Use _mm_malloc() for KRML_ALIGNED_MALLOC on macOS <10.15
- Add LEGACY_MACOS macros, use _mm_free() for KRML_ALIGNED_FREE on macOS <10.15
@bedevere-app
Copy link

bedevere-app bot commented Dec 18, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@aeiouaeiouaeiouaeiouaeiouaeiou aeiouaeiouaeiouaeiouaeiouaeiou changed the title gh-127897: backport HACL* compatibility changes gh-127897: Update HACL* module Dec 18, 2024
@aeiouaeiouaeiouaeiouaeiouaeiou aeiouaeiouaeiouaeiouaeiouaeiou marked this pull request as ready for review December 18, 2024 01:34
@picnixz picnixz changed the title gh-127897: Update HACL* module gh-127897: fix HACL* build on macOS/Catalina Dec 18, 2024
@gpshead
Copy link
Member

gpshead commented Dec 18, 2024

github appears stuck. i'm going to close and reopen the PR to retrigger it.

@gpshead gpshead closed this Dec 18, 2024
@gpshead gpshead reopened this Dec 18, 2024
@gpshead gpshead merged commit 3291656 into python:main Dec 18, 2024
52 checks passed
This was referenced Dec 20, 2024
Closed
Merged
srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 8, 2025
@aeiouaeiouaeiouaeiouaeiouaeiou @srinivasreddy
pythongh-127897: fix HACL* build on macOS/Catalina (pythonGH-127932)
1ad5430 
pythongh-127897: Update HACL* module from upstream sources to get:

- Lib_Memzero0.c: don't use memset_s() on macOS <10.9
- Use _mm_malloc() for KRML_ALIGNED_MALLOC on macOS <10.15
- Add LEGACY_MACOS macros, use _mm_free() for KRML_ALIGNED_FREE on macOS <10.15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead gpshead approved these changes

@picnixz picnixz Awaiting requested review from picnixz

@sethmlarson sethmlarson Awaiting requested review from sethmlarson sethmlarson is a code owner

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aeiouaeiouaeiouaeiouaeiouaeiou @picnixz @msprotz @gpshead