diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-11-12 00:57:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 08:57:58 -0800 |
| commit | 2c3ded47974d28741d9bfc248a4f31a44559efb6 (patch) | |
| tree | c853309b3a31c198a36e9931b93aef8ed0d3fe1a /ports/openssl/unix | |
| parent | 8de4ee858faf41fc6930c02203d873175940ea98 (diff) | |
| download | vcpkg-2c3ded47974d28741d9bfc248a4f31a44559efb6.tar.gz vcpkg-2c3ded47974d28741d9bfc248a4f31a44559efb6.zip | |
[openssl] Remove unused patches (#14477)
* [openssl] Remove unused patches
* Update ports/openssl/CONTROL
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/openssl/unix')
| -rw-r--r-- | ports/openssl/unix/ConfigureIncludeQuotesFix.patch | 13 | ||||
| -rw-r--r-- | ports/openssl/unix/EmbedSymbolsInStaticLibsZ7.patch | 25 | ||||
| -rw-r--r-- | ports/openssl/unix/STRINGIFYPatch.patch | 23 |
3 files changed, 0 insertions, 61 deletions
diff --git a/ports/openssl/unix/ConfigureIncludeQuotesFix.patch b/ports/openssl/unix/ConfigureIncludeQuotesFix.patch deleted file mode 100644 index 09494f565..000000000 --- a/ports/openssl/unix/ConfigureIncludeQuotesFix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Configure b/Configure -index c98107a..77ad9d3 100644 ---- a/Configure -+++ b/Configure -@@ -972,7 +972,7 @@ PROCESS_ARGS: - } - elsif (/^--with-zlib-include=(.*)$/) - { -- $withargs{"zlib-include"}="-I$1"; -+ $withargs{"zlib-include"}="-I\"$1\""; - } - elsif (/^--with-fipsdir=(.*)$/) - { diff --git a/ports/openssl/unix/EmbedSymbolsInStaticLibsZ7.patch b/ports/openssl/unix/EmbedSymbolsInStaticLibsZ7.patch deleted file mode 100644 index 1a8de2c4b..000000000 --- a/ports/openssl/unix/EmbedSymbolsInStaticLibsZ7.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl -index dba96cb..5722f6e 100644 ---- a/util/pl/VC-32.pl -+++ b/util/pl/VC-32.pl -@@ -154,9 +154,17 @@ else - $cflags=$opt_cflags.$base_cflags; - } - --# generate symbols.pdb unconditionally --$app_cflag.=" /Zi /Fd\$(TMP_D)/app"; --$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib"; -+# generate symbols.pdb when building dlls and embed symbols when building static libs -+if ($shlib) -+ { -+ $app_cflag.=" /Zi /Fd\$(TMP_D)/app.pdb"; -+ $lib_cflag.=" /Zi /Fd\$(TMP_D)/lib.pdb"; -+ } -+else -+ { -+ $app_cflag.=" /Z7"; -+ $lib_cflag.=" /Z7"; -+ } - $lflags.=" /debug"; - - $obj='.obj'; diff --git a/ports/openssl/unix/STRINGIFYPatch.patch b/ports/openssl/unix/STRINGIFYPatch.patch deleted file mode 100644 index dd8f9c297..000000000 --- a/ports/openssl/unix/STRINGIFYPatch.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/crypto/cversion.c b/crypto/cversion.c -index bfff699..17b7912 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -56,6 +56,9 @@ - * [including the GNU Public Licence.] - */ - -+#define STRINGIFY2(x) #x -+#define STRINGIFY(x) STRINGIFY2(x) -+ - #include "cryptlib.h" - - #ifndef NO_WINDOWS_BRAINDEATH -@@ -79,7 +82,7 @@ const char *SSLeay_version(int t) - } - if (t == SSLEAY_CFLAGS) { - #ifdef CFLAGS -- return (CFLAGS); -+ return STRINGIFY(CFLAGS); - #else - return ("compiler: information not available"); - #endif |