diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/openssl/PerlScriptSpaceInPathFixes.patch | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/openssl/PerlScriptSpaceInPathFixes.patch')
| -rw-r--r-- | ports/openssl/PerlScriptSpaceInPathFixes.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/ports/openssl/PerlScriptSpaceInPathFixes.patch b/ports/openssl/PerlScriptSpaceInPathFixes.patch deleted file mode 100644 index 1dcf8a991..000000000 --- a/ports/openssl/PerlScriptSpaceInPathFixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/util/copy.pl b/util/copy.pl -index eba6d58..5d971a2 100644 ---- a/util/copy.pl -+++ b/util/copy.pl -@@ -19,7 +19,7 @@ foreach $arg (@ARGV) { - next; - } - $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... -- foreach (glob $arg) -+ foreach (glob qq("$arg")) - { - push @filelist, $_; - } -diff --git a/util/mk1mf.pl b/util/mk1mf.pl -index 128a405..fd853da 100644 ---- a/util/mk1mf.pl -+++ b/util/mk1mf.pl -@@ -428,7 +428,7 @@ EOF - { - $extra_install .= <<"EOF" - \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\" -- \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\" -+ \$(CP) \$(E_SHLIB) \"\$(INSTALLTOP)${o}lib${o}engines\" - EOF - } - } -@@ -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\" -- \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\" -+ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\" - \$(MKDIR) \"\$(OPENSSLDIR)\" - \$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\" - $extra_install |