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

build, win: opt-in openssl_no_asm if no nasm found #19943

Closed
wants to merge 2 commits into from

Conversation

shigeki
Copy link
Contributor

@shigeki shigeki commented Apr 11, 2018

Instead of automatically falling back to openssl_no_asm with warning
if no nasm is found during build on Windows, this stops vcbuild.bat
and requires users to specify openssl_no_asm option explicitly.

Fixes #19918.
Refs #19930

CC @joaocgreis , @nodejs/build

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

Instead of automatically falling back to openssl_no_asm with warning
if no nasm is found during build on Windows, this stops vcbuild.bat
and requires users to specify openssl_no_asm option explicitly.
@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. windows Issues and PRs related to the Windows platform. labels Apr 11, 2018
BUILDING.md Outdated
@@ -258,9 +258,9 @@ Prerequisites:
* Basic Unix tools required for some tests,
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
* **Optional** (for OpenSSL assembler modules): the [NetWide Assembler](http://www.nasm.us/),
* The [NetWide Assembler](http://www.nasm.us/), for OpenSSL assembler modules
Copy link
Contributor

Choose a reason for hiding this comment

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

modules if not -> modules. If not?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. both fixed in 6d75d2b.

BUILDING.md Outdated
if not installed in the default location it needs to be manually added
to `PATH`.
to `PATH`. Build with openssl-no-asm option does not require this.
Copy link
Contributor

Choose a reason for hiding this comment

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

openssl-no-asm -> `openssl-no-asm`

@vsemozhetbyt
Copy link
Contributor

I am adding fast-track, please, remove if I am wrong.

CI: https://ci.nodejs.org/job/node-test-pull-request/14202/

@vsemozhetbyt vsemozhetbyt added the fast-track PRs that do not need to wait for 48 hours to land. label Apr 11, 2018
shigeki added a commit that referenced this pull request Apr 12, 2018
Instead of automatically falling back to openssl_no_asm with warning
if no nasm is found during build on Windows, this stops vcbuild.bat
and requires users to specify openssl_no_asm option explicitly.

Fixes: #19918
PR-URL: #19943
Refs: #19930
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
@shigeki
Copy link
Contributor Author

shigeki commented Apr 12, 2018

CI is fine except susupended fedora-last-latest-x64.
This is fast track and it has enough reviewers. Landed in f3f1298. Thanks.

@shigeki shigeki closed this Apr 12, 2018
jasnell pushed a commit that referenced this pull request Apr 16, 2018
Instead of automatically falling back to openssl_no_asm with warning
if no nasm is found during build on Windows, this stops vcbuild.bat
and requires users to specify openssl_no_asm option explicitly.

Fixes: #19918
PR-URL: #19943
Refs: #19930
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
@rvagg rvagg added v10.x and removed v10.x labels Apr 20, 2018
@BridgeAR
Copy link
Member

BridgeAR commented May 1, 2018

If I am not mistaken, this relies on a semver-major change and should therefore not be backported. I added the labels accordingly. Please fix that if I am mistaken.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. fast-track PRs that do not need to wait for 48 hours to land. windows Issues and PRs related to the Windows platform.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

build: default building of master is broken on Windows without NASM
8 participants