projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rpath-related Linux "test_shlibload" failure.
[openssl.git]
/
util
/
dofile.pl
diff --git
a/util/dofile.pl
b/util/dofile.pl
index 76dfe2b607f44f011c0a490a1554a6b8c2c07f99..c3bc9ba9d6045faa3dc53d8baaa4be7cb5ce919b 100644
(file)
--- a/
util/dofile.pl
+++ b/
util/dofile.pl
@@
-1,5
+1,11
@@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
#
#
+# Licensed under the OpenSSL license (the "License"). You may not use
+# this file except in compliance with the License. You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
# Reads one or more template files and runs it through Text::Template
#
# It is assumed that this scripts is called with -Mconfigdata, a module
# Reads one or more template files and runs it through Text::Template
#
# It is assumed that this scripts is called with -Mconfigdata, a module
@@
-8,6
+14,7
@@
use strict;
use warnings;
use strict;
use warnings;
+use FindBin;
use Getopt::Std;
# We actually expect to get the following hash tables from configdata:
use Getopt::Std;
# We actually expect to get the following hash tables from configdata:
@@
-32,10
+39,12
@@
package OpenSSL::Template;
# a fallback in case it's not installed on the system
use File::Basename;
use File::Spec::Functions;
# a fallback in case it's not installed on the system
use File::Basename;
use File::Spec::Functions;
-use lib
catdir(dirname(__FILE__))
;
-use with_fallback
qw(Text::Template)
;
+use lib
"$FindBin::Bin/perl"
;
+use with_fallback
"Text::Template 1.46"
;
-use parent qw/Text::Template/;
+#use parent qw/Text::Template/;
+use vars qw/@ISA/;
+push @ISA, qw/Text::Template/;
# Override constructor
sub new {
# Override constructor
sub new {
@@
-83,7
+92,7
@@
package main;
# Helper functions for the templates #################################
# It might be practical to quotify some strings and have them protected
# Helper functions for the templates #################################
# It might be practical to quotify some strings and have them protected
-# from possible harm. These functions primarly quote things that might
+# from possible harm. These functions primar
i
ly quote things that might
# be interpreted wrongly by a perl eval.
# quotify1 STRING
# be interpreted wrongly by a perl eval.
# quotify1 STRING
@@
-97,7
+106,7
@@
sub quotify1 {
# quotify_l LIST
# For each defined element in LIST (i.e. elements that aren't undef), have
# quotify_l LIST
# For each defined element in LIST (i.e. elements that aren't undef), have
-# it quotified with 'quot
o
fy1'
+# it quotified with 'quot
i
fy1'
sub quotify_l {
map {
if (!defined($_)) {
sub quotify_l {
map {
if (!defined($_)) {
@@
-151,7
+160,11
@@
my @autowarntext = ("WARNING: do not edit!",
my $prev_linecount = 0;
my $text =
@ARGV
my $prev_linecount = 0;
my $text =
@ARGV
- ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+ ? join("", map { my $x = Text::Template::_load_text($_);
+ if (!defined($x)) {
+ die $Text::Template::ERROR, "\n";
+ }
+ $x = "{- output_reset_on() -}" . $x;
my $linecount = $x =~ tr/\n//;
$prev_linecount = ($linecount += $prev_linecount);
$lines{$linecount} = $_;
my $linecount = $x =~ tr/\n//;
$prev_linecount = ($linecount += $prev_linecount);
$lines{$linecount} = $_;
@@
-163,7
+176,10
@@
my $text =
# Load the full template (combination of files) into Text::Template
# and fill it up with our data. Output goes directly to STDOUT
# Load the full template (combination of files) into Text::Template
# and fill it up with our data. Output goes directly to STDOUT
-my $template = OpenSSL::Template->new(TYPE => 'STRING', SOURCE => $text );
+my $template =
+ OpenSSL::Template->new(TYPE => 'STRING',
+ SOURCE => $text,
+ PREPEND => qq{use lib "$FindBin::Bin/perl";});
sub output_reset_on {
$template->output_reset_on();
sub output_reset_on {
$template->output_reset_on();
@@
-181,6
+197,7
@@
sub output_off {
$template->fill_in(OUTPUT => \*STDOUT,
HASH => { config => \%config,
target => \%target,
$template->fill_in(OUTPUT => \*STDOUT,
HASH => { config => \%config,
target => \%target,
+ disabled => \%disabled,
withargs => \%withargs,
unified_info => \%unified_info,
autowarntext => \@autowarntext,
withargs => \%withargs,
unified_info => \%unified_info,
autowarntext => \@autowarntext,