Skip to content

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

Merged
gpshead merged 1 commit into
python:mainfrom
aeiouaeiouaeiouaeiouaeiouaeiou:gh-127897
Dec 18, 2024
Merged

gpshead merged 1 commit into
python:mainfrom
aeiouaeiouaeiouaeiouaeiouaeiou:gh-127897

Conversation

@aeiouaeiouaeiouaeiouaeiouaeiou

@aeiouaeiouaeiouaeiouaeiouaeiou aeiouaeiouaeiouaeiouaeiouaeiou commented Dec 13, 2024 •

Copy link
Copy Markdown
Contributor

@ghost

ghost commented Dec 13, 2024 •

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app

bedevere-app Bot commented Dec 13, 2024

Copy link
Copy Markdown

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

Copy link
Copy Markdown
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

picnixz commented Dec 14, 2024

Copy link
Copy Markdown
Member

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

aeiouaeiouaeiouaeiouaeiouaeiou commented Dec 14, 2024 •

Copy link
Copy Markdown
Contributor Author

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
Copy Markdown
Contributor Author

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

@msprotz

msprotz commented Dec 17, 2024

Copy link
Copy Markdown
Contributor

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

bedevere-app Bot commented Dec 18, 2024

Copy link
Copy Markdown

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.

- 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

bedevere-app Bot commented Dec 18, 2024

Copy link
Copy Markdown

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

gpshead commented Dec 18, 2024

Copy link
Copy Markdown
Member

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
srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 8, 2025
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants