From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Jul 2012 13:40:04 +0000 (+0000)
Subject: mk1mf.pl: replace chop for windows.
X-Git-Tag: OpenSSL_1_0_1n~61
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2df0ba9b4f20f07f7d5bead4d2107d29d62b1798;p=oweals%2Fopenssl.git

mk1mf.pl: replace chop for windows.

Backport old patch to make it work in mixture of perls for Windows.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Cherry-picked from 7bb98eee3c9e4694dfc2217001d5075ce8d2906e

(cherry picked from commit 051b41df4105355a5a9c7f1c0bd00cc70b2d324c)
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 550ef9f685..1eee7aa349 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -326,7 +326,7 @@ open(IN,"<$infile") || die "unable to open $infile:$!\n";
 $_=<IN>;
 for (;;)
 	{
-	chop;
+	s/\s*$//; # was chop, didn't work in mixture of perls for Windows...
 
 	($key,$val)=/^([^=]+)=(.*)/;
 	if ($key eq "RELATIVE_DIRECTORY")