Prepare for vendoring BoringSSL

apple · Jan 30, 2025 · e405a89 · e405a89
1 parent b4a26ae
commit e405a89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -142,7 +142,7 @@ let package = Package(
             ]
         ),
     ],
-    cxxLanguageStandard: .cxx14
+    cxxLanguageStandard: .cxx17
 )
 
 // ---    STANDARD CROSS-REPO SETTINGS DO NOT EDIT   --- //

diff --git a/scripts/patch-2-inttypes.patch b/scripts/patch-2-inttypes.patch
@@ -2,8 +2,8 @@ diff --git a/Sources/CNIOBoringSSL/crypto/x509/t_x509.cc b/Sources/CNIOBoringSSL
 index 7a3acc8..c0bc1c5 100644
 --- a/Sources/CNIOBoringSSL/crypto/x509/t_x509.cc
 +++ b/Sources/CNIOBoringSSL/crypto/x509/t_x509.cc
-@@ -55,6 +55,7 @@
-  * [including the GNU Public Licence.] */
+@@ -8,6 +8,7 @@
+  */
 
  #include <assert.h>
 +#include <inttypes.h>  // for PRIu64 and friends

diff --git a/scripts/patch-3-more-inttypes.patch b/scripts/patch-3-more-inttypes.patch
@@ -2,10 +2,10 @@ diff --git a/Sources/CNIOBoringSSL/crypto/evp/print.cc b/Sources/CNIOBoringSSL/c
 index 89ceb32..5e6fb2f 100644
 --- a/Sources/CNIOBoringSSL/crypto/evp/print.cc
 +++ b/Sources/CNIOBoringSSL/crypto/evp/print.cc
-@@ -50,6 +50,8 @@
-  * ([email protected]).  This product includes software written by Tim
-  * Hudson ([email protected]). */
- 
+@@ -7,6 +7,8 @@
+  * https://www.openssl.org/source/license.html
+  */
+
 +#include <inttypes.h>
 +
  #include <CNIOBoringSSL_evp.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,7 +142,7 @@ let package = Package( @@
                 ]
             ),
         ],
-        cxxLanguageStandard: .cxx14
+        cxxLanguageStandard: .cxx17
     )
     // ---    STANDARD CROSS-REPO SETTINGS DO NOT EDIT   --- //
@@ Expand Down @@