Commit 8bf5b8ab authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix some faults in util/mk1mf.pl 



When building on Unix, there are times when the 'EX_LIB' MINFO variable
contains valuable information.  Make sure to take care of it.

fixrules in util/pl/unix.pl was previously changed with a simpler fix of
rules, with a comment claiming that's compatible with -j.  Unfortunately,
this breaks multiline rules and doesn't change anything for single line
rules.  While at it, do not prefix pure echo lines with a 'cd $(TEST_D) &&',
as that's rather silly.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent e93c8748

util/mk1mf.pl

+3 −0
Original line number Diff line number Diff line
@@ -393,6 +393,9 @@ for (;;) 
	if ($key eq "LIBKRB5")

		{ $ex_libs .= " $val" if $val ne "";}



	if ($key eq "EX_LIBS")

		{ $ex_libs .= " $val" if $val ne "";}



	if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))

		{ $test.=&var_add($dir,$val, 0); }

util/pl/unix.pl

+5 −5
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ sub fixrules 
  my ($str) = @_;



  # Compatible with -j...

  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;

  return $str;

#  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;

#  return $str;



  # Compatible with not -j.

  my @t = split("\n", $str);
@@ -246,7 +246,7 @@ sub fixrules 
        {

        $t =~ s/^@/\@cd \$(TEST_D) && /;

        }

      elsif ($t !~ /^\s*#/)

      elsif ($t !~ /^\s*#/ && $t !~ /^echo/)

        {

        $t = 'cd $(TEST_D) && ' . $t;

        }