diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-20 16:27:59 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-20 16:27:59 -0700 |
| commit | 951ea973ce99f7ad15094925e78ba7dbd031ab34 (patch) | |
| tree | cc889ffde37871e9e49bffa30b137b90e50dd8fa | |
| parent | 8dd90aa9766811ccfb74bcf578364eca573f0c6c (diff) | |
| download | vcpkg-951ea973ce99f7ad15094925e78ba7dbd031ab34.tar.gz vcpkg-951ea973ce99f7ad15094925e78ba7dbd031ab34.zip | |
[openssl] Improve patches
| -rw-r--r-- | ports/openssl/ConfigureIncludeQuotesFix.patch | 2 | ||||
| -rw-r--r-- | ports/openssl/PerlScriptSpaceInPathFixes.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/openssl/ConfigureIncludeQuotesFix.patch b/ports/openssl/ConfigureIncludeQuotesFix.patch index 1689ec4e0..09494f565 100644 --- a/ports/openssl/ConfigureIncludeQuotesFix.patch +++ b/ports/openssl/ConfigureIncludeQuotesFix.patch @@ -2,7 +2,7 @@ diff --git a/Configure b/Configure index c98107a..77ad9d3 100644 --- a/Configure +++ b/Configure -@@ -970,7 +970,7 @@ PROCESS_ARGS: +@@ -972,7 +972,7 @@ PROCESS_ARGS: } elsif (/^--with-zlib-include=(.*)$/) { diff --git a/ports/openssl/PerlScriptSpaceInPathFixes.patch b/ports/openssl/PerlScriptSpaceInPathFixes.patch index b3a52fc97..1dcf8a991 100644 --- a/ports/openssl/PerlScriptSpaceInPathFixes.patch +++ b/ports/openssl/PerlScriptSpaceInPathFixes.patch @@ -7,7 +7,7 @@ index eba6d58..5d971a2 100644 } $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... - foreach (glob $arg) -+ foreach (glob "\"$arg\"") ++ foreach (glob qq("$arg")) { push @filelist, $_; } @@ -15,7 +15,7 @@ diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 128a405..fd853da 100644 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl -@@ -427,7 +427,7 @@ EOF +@@ -428,7 +428,7 @@ EOF { $extra_install .= <<"EOF" \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\" @@ -24,7 +24,7 @@ index 128a405..fd853da 100644 EOF } } -@@ -607,7 +607,7 @@ install: all +@@ -608,7 +608,7 @@ install: all \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\" \$(MKDIR) \"\$(INSTALLTOP)${o}lib\" \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\" |