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

Fix build on NonStop #19811

Closed
wants to merge 1 commit into from
Closed

Fix build on NonStop #19811

wants to merge 1 commit into from

Conversation

t8m
Copy link
Member

@t8m t8m commented Dec 1, 2022

Fixes #19810

We support speed -mlock option on Linux and Windows only, include the sys/mman.h only for Linux.

@t8m t8m added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: bug The issue/pr is/fixes a bug branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing labels Dec 1, 2022
@t8m t8m mentioned this pull request Dec 1, 2022
Closed
@t-j-h t-j-h removed the approval: otc review pending This pull request needs review by an OTC member label Dec 1, 2022
beldmit
beldmit approved these changes Dec 1, 2022
View reviewed changes
Copy link
Member

@beldmit beldmit left a comment

Choose a reason for hiding this comment

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

LGTM

@beldmit beldmit added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Dec 1, 2022
@t8m t8m added this to the 3.1.0 milestone Dec 2, 2022
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Dec 2, 2022
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@t8m
Copy link
Member Author

t8m commented Dec 5, 2022

Merged to master and 3.1 branches. Thank you for the reviews.

@t8m t8m closed this Dec 5, 2022
openssl-machine pushed a commit that referenced this pull request Dec 5, 2022
@t8m
Fix build on NonStop
f029420 
Fixes #19810

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #19811)

(cherry picked from commit d861bc0)
openssl-machine pushed a commit that referenced this pull request Dec 5, 2022
@t8m
Fix build on NonStop
d861bc0 
Fixes #19810

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #19811)
beldmit pushed a commit to beldmit/openssl that referenced this pull request Dec 26, 2022
@t8m @beldmit
Fix build on NonStop
e68d8fc 
Fixes openssl#19810

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from openssl#19811)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@levitte levitte levitte approved these changes

@t-j-h t-j-h t-j-h approved these changes

@beldmit beldmit beldmit approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Milestone
3.1.0
Development

Successfully merging this pull request may close these issues.

OpenSSL 3.1 does not compile on NonStop because of mman dependency.
5 participants
@t8m @openssl-machine @levitte @t-j-h @beldmit