| Subject: | git-formatted patch files are not always parsed properly |
Here is a sample patch file generated by git that causes ppt's patch to error with "Hmm... I can't seem to find a patch in there anywhere."
| Subject: | Net-SSLeay.patch |
From 8e74c91bafe5587f0a2850f1e1366d752b81ede7 Mon Sep 17 00:00:00 2001
From: Andy Grundman <andyg@activestate.com>
Date: Thu, 28 Jan 2016 12:24:10 -0500
Subject: [PATCH] Point Net-SSLeay at our libs dir and fix gcc static linking
order
---
inc/Module/Install/PRIVATE/Net/SSLeay.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
index b46ead5..1ea85df 100644
--- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
@@ -47,7 +47,7 @@ EOM
LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
);
- if ( $self->prompt(
+ if ( 1 || $self->prompt(
"Do you want to run external tests?\n".
"These tests *will* *fail* if you do not have network connectivity.",
'n',
@@ -92,7 +92,7 @@ EOM
my $found = 0;
my @pairs = ();
# Library names depend on the compiler
- @pairs = (['eay32','ssl32'],['crypto.dll','ssl.dll'],['crypto','ssl']) if $Config{cc} =~ /gcc/;
+ @pairs = (['eay32','ssl32'],['crypto.dll','ssl.dll'],['ssl','crypto']) if $Config{cc} =~ /gcc/;
@pairs = (['libeay32','ssleay32'],['libeay32MD','ssleay32MD'],['libeay32MT','ssleay32MT']) if $Config{cc} =~ /cl/;
for my $dir (@{$opts->{lib_paths}}) {
for my $p (@pairs) {
@@ -174,8 +174,8 @@ sub check_no_path { # On OS/2 it would be typically on default paths
sub find_openssl_prefix {
my ($self, $dir) = @_;
- if (defined $ENV{OPENSSL_PREFIX}) {
- return $ENV{OPENSSL_PREFIX};
+ if (defined $ENV{FLY_LIBS}) {
+ return $ENV{FLY_LIBS};
}
my @guesses = (
--
2.5.4 (Apple Git-61)