make patch system support OS-specific patches

gitkraken-jacobw · ianhattendorf · commit 1bcdcdba7bc8 · 2022-10-20T12:21:16.000-07:00
diff --git a/utils/acquireOpenSSL.js b/utils/acquireOpenSSL.js
@@ -42,10 +42,10 @@ class HashVerify extends stream.Transform {
 }
 
 // currently this only needs to be done on linux
-const applyOpenSSLPatches = async (buildCwd) => {
+const applyOpenSSLPatches = async (buildCwd, operatingSystem) => {
   try {
     for (const patchFilename of await fse.readdir(opensslPatchPath)) {
-      if (patchFilename.split(".").pop() === "patch") {
+      if (patchFilename.split(".").pop() === "patch" && patchFilename.split("-")[1] === operatingSystem) {
         console.log(`applying ${patchFilename}`);
         await execPromise(`patch -up0 -i ${path.join(opensslPatchPath, patchFilename)}`, {
           cwd: buildCwd
@@ -80,6 +80,8 @@ const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
     cwd: buildCwd
   }, { pipeOutput: true });
 
+  await applyOpenSSLPatches(buildCwd, "linux");
+
   // only build the libraries, not the tests/fuzzer or apps
   await execPromise("make build_libs", {
     cwd: buildCwd
@@ -117,7 +119,7 @@ const buildLinux = async (buildCwd) => {
     cwd: buildCwd
   }, { pipeOutput: true });
 
-  await applyOpenSSLPatches(buildCwd);
+  await applyOpenSSLPatches(buildCwd, "linux");
 
   // only build the libraries, not the tests/fuzzer or apps
   await execPromise("make build_libs", {
@@ -136,6 +138,8 @@ const buildLinux = async (buildCwd) => {
 };
 
 const buildWin32 = async (buildCwd) => {
+  await applyOpenSSLPatches(buildCwd, "win32");
+
   const vcvarsallArch = process.arch === "x64" ? "x64" : "x86";
   const programFilesPath = (vcvarsallArch === "x64"
     ? process.env["ProgramFiles(x86)"]
diff --git a/vendor/patches/README.md b/vendor/patches/README.md
@@ -5,7 +5,9 @@ Patches will be applied from 000 to 999
 
 ### Naming Convention
 
-`<number 3 digits>-<description>.patch`
+`<number 3 digits>-<operating system>-<description>.patch`
+
+Operating system is either "win32", "darwin", or "linux".
 
 ### Content
 
diff --git a/vendor/patches/openssl/001-linux-force_getentropy_dso_lookup.patch b/vendor/patches/openssl/001-linux-force_getentropy_dso_lookup.patch
