From 31ba0e17585bd16e089afa3a44979ccd9561182a Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sun, 28 Feb 2016 12:24:49 -0500 Subject: [PATCH 1/1] Fix mk1mf build Removing certs broke the mk1mf build. Reviewed-by: Richard Levitte --- util/mk1mf.pl | 2 +- util/pl/BC-32.pl | 3 --- util/pl/VC-32.pl | 3 --- util/pl/unix.pl | 6 +----- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 3e8967c315..4fb3a539f6 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -806,7 +806,7 @@ reallyclean: EOF -$rules .= &do_rehash_rule("rehash.time", "certs/demo apps tools"); +$rules .= &do_rehash_rule("rehash.time", "apps tools"); $rules .= &do_test_rule("test", "rehash.time", "run_tests.pl"); $rules .= <<"EOF"; diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index 59a597d144..57384bba1e 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -99,9 +99,6 @@ sub do_rehash_rule { my ($target, $deps) = @_; my $ret = <<"EOF"; $target: $deps - set OPENSSL=\$(BIN_D)${o}openssl.exe - set OPENSSL_DEBUG_MEMORY=on - \$(PERL) \$(BIN_D)${o}c_rehash certs/demo echo off > $target EOF return $ret diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 03dee98a84..8c7c9f8a13 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -305,9 +305,6 @@ sub do_rehash_rule { my ($target, $deps) = @_; my $ret = <<"EOF"; $target: $deps - set OPENSSL=\$(BIN_D)${o}openssl.exe - set OPENSSL_DEBUG_MEMORY=on - \$(PERL) \$(BIN_D)${o}c_rehash certs/demo echo off > $target EOF return $ret diff --git a/util/pl/unix.pl b/util/pl/unix.pl index 59767b4a6d..09f74865a7 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -190,11 +190,7 @@ sub do_rehash_rule { my ($target, $deps) = @_; my $ret = <<"EOF"; $target: $deps - (OPENSSL="`pwd`/util/opensslwrap.sh"; \\ - OPENSSL_DEBUG_MEMORY=on; \\ - export OPENSSL OPENSSL_DEBUG_MEMORY; \\ - \$(PERL) \$(BIN_D)${o}c_rehash certs/demo; \\ - touch $target) + touch $target EOF return $ret } -- 2.34.1