From f0a401b1745a4b344b95cc7f01483c29e919d94a Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 8 Jan 2025 17:11:36 +0100
Subject: [PATCH] [openssl] Fix build with `"C:\Program Files\<...>\cl.exe"`
 (#43089)

---
 ports/openssl/mkbuildinf.diff | 15 +++++++++++++++
 ports/openssl/portfile.cmake  |  1 +
 ports/openssl/vcpkg.json      |  1 +
 versions/baseline.json        |  2 +-
 versions/o-/openssl.json      |  5 +++++
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 ports/openssl/mkbuildinf.diff

diff --git a/ports/openssl/mkbuildinf.diff b/ports/openssl/mkbuildinf.diff
new file mode 100644
index 0000000000..e756c8c6a8
--- /dev/null
+++ b/ports/openssl/mkbuildinf.diff
@@ -0,0 +1,15 @@
+diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl
+index a57c80a..5cecf83 100755
+--- a/util/mkbuildinf.pl
++++ b/util/mkbuildinf.pl
+@@ -9,7 +9,9 @@
+ use strict;
+ use warnings;
+ 
+-my ($cflags, $platform) = @ARGV;
++my $platform = pop @ARGV;
++my $cflags = join(' ', @ARGV);
++$cflags =~ s(\\)(\\\\)g;
+ $cflags = "compiler: $cflags";
+ 
+ # Use the value of the envvar SOURCE_DATE_EPOCH, even if it's
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 732da8dbe5..c4b0113948 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
     PATCHES
         cmake-config.patch
         command-line-length.patch
+        mkbuildinf.diff
         script-prefix.patch
         asm-armcap.patch
         windows/install-layout.patch
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index d9350a1f3f..ef168c96da 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openssl",
   "version": "3.4.0",
+  "port-version": 1,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 63670b8c43..9906e15db8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6766,7 +6766,7 @@
     },
     "openssl": {
       "baseline": "3.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "opensubdiv": {
       "baseline": "3.5.0",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index bc69fea558..d4c2408bf7 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "facccb0b0c47f9804b6e336096d0985c3e541eec",
+      "version": "3.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ce504a83eb9627d54f1cffdb497a6bf5bd970d18",
       "version": "3.4.0",