Merge pull request nodegit#1877 from ianhattendorf/fix/openssl-no-shared

ianhattendorf · web-flow · commit 887b3bb59ccf · 2021-12-01T16:06:09.000-07:00
Don't build shared OpenSSL libs
diff --git a/utils/acquireOpenSSL.js b/utils/acquireOpenSSL.js
@@ -41,7 +41,7 @@ class HashVerify extends stream.Transform {
 }
 
 const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
-  await execPromise(`./Configure darwin64-x86_64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --prefix="${
+  await execPromise(`./Configure darwin64-x86_64-cc no-shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --prefix="${
     extractPath
   }" --openssldir="${extractPath}" -mmacosx-version-min=${macOsDeploymentTarget}`, {
     cwd: buildCwd
diff --git a/utils/build-openssl.bat b/utils/build-openssl.bat
@@ -1,6 +1,6 @@
 @call %1 %2
 
-perl .\Configure %3 shared no-ssl2 no-ssl3 no-comp --prefix="%cd%\.." --openssldir="%cd%\.." || goto :error
+perl .\Configure %3 no-shared no-ssl2 no-ssl3 no-comp --prefix="%cd%\.." --openssldir="%cd%\.." || goto :error
 
 nmake || goto :error
 nmake test || goto :error

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class HashVerify extends stream.Transform {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {`
`44`		- await execPromise(`./Configure darwin64-x86_64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --prefix="${
	`44`	+ await execPromise(`./Configure darwin64-x86_64-cc no-shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --prefix="${
`45`	`45`	`extractPath`
`46`	`46`	}" --openssldir="${extractPath}" -mmacosx-version-min=${macOsDeploymentTarget}`, {
`47`	`47`	`cwd: buildCwd`