[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Feb 10 04:10:32 UTC 2016
The branch master has been updated
via e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2 (commit)
via 2e963849b7ec501e4f2d6ffee31e08b2643b6e11 (commit)
from 183733f882056ea3e6fe95e665b85fcc6a45dcb4 (commit)
- Log -----------------------------------------------------------------
commit e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Feb 10 02:18:38 2016 +0100
Simplify the specification of include dirs in the build dir
In build.info files, make the include directory in the build directory
absolute, or Configure will think it should be added to the source
directory top. Configure will turn it into a relative path if
possible.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 2e963849b7ec501e4f2d6ffee31e08b2643b6e11
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Feb 10 02:00:37 2016 +0100
Make the processing of build.info files more aware of absolute dirs
There were cases where some input was absolute, and concatenating it
to the diretory to the source or build top could fail spectacularly.
Let's check the input first to see if it's absolute.
And while we're on the subject of checking if a file or dir spec is
absolute using file_name_is_absolute() has its own quirks on VMS,
where a logical name is considered absolute under most circumstances.
This is perfectly correct from a VMS point of view, but when parsing
the build.info files, we want single word file or directory names to
only be checked syntactically. A function isabsolute() that does the
right thing is the solution.
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 75 ++++++++++++++++++++++++++---------------
apps/build.info | 4 +--
build.info | 6 ++--
engines/build.info | 10 +++---
test/build.info | 98 +++++++++++++++++++++++++++---------------------------
5 files changed, 108 insertions(+), 85 deletions(-)
diff --git a/Configure b/Configure
index afd905c..941b4aa 100755
--- a/Configure
+++ b/Configure
@@ -1183,27 +1183,34 @@ if ($builder eq "unified") {
use with_fallback qw(Text::Template);
sub cleandir {
+ my $base = shift;
my $dir = shift;
- my $base = shift || ".";
+ my $relativeto = shift || ".";
+
+ $dir = catdir($base,$dir) unless isabsolute($dir);
# Make sure the directories we're building in exists
mkpath($dir);
- my $res = abs2rel(absolutedir($dir), rel2abs($base));
+ my $res = abs2rel(absolutedir($dir), rel2abs($relativeto));
#print STDERR "DEBUG[cleandir]: $dir , $base => $res\n";
return $res;
}
sub cleanfile {
+ my $base = shift;
my $file = shift;
- my $base = shift || ".";
+ my $relativeto = shift || ".";
+
+ $file = catfile($base,$file) unless isabsolute($file);
+
my $d = dirname($file);
my $f = basename($file);
# Make sure the directories we're building in exists
mkpath($d);
- my $res = abs2rel(catfile(absolutedir($d), $f), rel2abs($base));
+ my $res = abs2rel(catfile(absolutedir($d), $f), rel2abs($relativeto));
#print STDERR "DEBUG[cleanfile]: $d , $f => $res\n";
return $res;
}
@@ -1345,8 +1352,8 @@ if ($builder eq "unified") {
die "$_ renamed to more than one thing: "
,join(" ", @{$renames{$_}}),"\n"
if scalar @{$renames{$_}} > 1;
- my $dest = cleanfile(catfile($buildd, $_), $blddir);
- my $to = cleanfile(catfile($buildd, $renames{$_}->[0]), $blddir);
+ my $dest = cleanfile($buildd, $_, $blddir);
+ my $to = cleanfile($buildd, $renames{$_}->[0], $blddir);
die "$dest renamed to more than one thing: "
,$unified_info{rename}->{$dest}, $to
unless !defined($unified_info{rename}->{$dest})
@@ -1355,7 +1362,7 @@ if ($builder eq "unified") {
}
foreach (@programs) {
- my $program = cleanfile(catfile($buildd, $_), $blddir);
+ my $program = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$program}) {
$program = $unified_info{rename}->{$program};
}
@@ -1363,7 +1370,7 @@ if ($builder eq "unified") {
}
foreach (@libraries) {
- my $library = cleanfile(catfile($buildd, $_), $blddir);
+ my $library = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$library}) {
$library = $unified_info{rename}->{$library};
}
@@ -1375,7 +1382,7 @@ ENGINES can only be used if configured with 'shared'.
This is usually a fault in a build.info file.
EOF
foreach (@engines) {
- my $library = cleanfile(catfile($buildd, $_), $blddir);
+ my $library = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$library}) {
$library = $unified_info{rename}->{$library};
}
@@ -1383,7 +1390,7 @@ EOF
}
foreach (@scripts) {
- my $script = cleanfile(catfile($buildd, $_), $blddir);
+ my $script = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$script}) {
$script = $unified_info{rename}->{$script};
}
@@ -1391,7 +1398,7 @@ EOF
}
foreach (@extra) {
- my $extra = cleanfile(catfile($buildd, $_), $blddir);
+ my $extra = cleanfile($buildd, $_, $blddir);
$unified_info{extra}->{$extra} = 1;
}
@@ -1400,15 +1407,14 @@ EOF
if (!$config{no_shared}) {
# Check sharednames.
foreach (keys %sharednames) {
- my $dest = cleanfile(catfile($buildd, $_), $blddir);
+ my $dest = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$dest}) {
$dest = $unified_info{rename}->{$dest};
}
die "shared_name for $dest with multiple values: "
,join(" ", @{$sharednames{$_}}),"\n"
if scalar @{$sharednames{$_}} > 1;
- my $to = cleanfile(catfile($buildd, $sharednames{$_}->[0]),
- $blddir);
+ my $to = cleanfile($buildd, $sharednames{$_}->[0], $blddir);
die "shared_name found for a library $dest that isn't defined\n"
unless $unified_info{libraries}->{$dest};
die "shared_name for $dest with multiple values: "
@@ -1429,7 +1435,7 @@ EOF
foreach (keys %ordinals) {
my $dest = $_;
- my $ddest = cleanfile(catfile($buildd, $_), $blddir);
+ my $ddest = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$ddest}) {
$ddest = $unified_info{rename}->{$ddest};
}
@@ -1437,9 +1443,9 @@ EOF
my %known_ordinals =
(
crypto =>
- cleanfile(catfile($sourced, "util", "libeay.num"), $blddir),
+ cleanfile($sourced, catfile("util", "libeay.num"), $blddir),
ssl =>
- cleanfile(catfile($sourced, "util", "ssleay.num"), $blddir)
+ cleanfile($sourced, catfile("util", "ssleay.num"), $blddir)
);
my $o = $known_ordinals{$_};
die "Ordinals for $ddest defined more than once\n"
@@ -1450,22 +1456,22 @@ EOF
foreach (keys %sources) {
my $dest = $_;
- my $ddest = cleanfile(catfile($buildd, $_), $blddir);
+ my $ddest = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$ddest}) {
$ddest = $unified_info{rename}->{$ddest};
}
foreach (@{$sources{$dest}}) {
- my $s = cleanfile(catfile($sourced, $_), $blddir);
+ my $s = cleanfile($sourced, $_, $blddir);
# If it isn't in the source tree, we assume it's generated
# in the build tree
if (! -f $s) {
- $s = cleanfile(catfile($buildd, $_), $blddir);
+ $s = cleanfile($buildd, $_, $blddir);
}
# We recognise C and asm files
if ($s =~ /\.[csS]\b$/) {
(my $o = $_) =~ s/\.[csS]\b$/.o/;
- $o = cleanfile(catfile($buildd, $o), $blddir);
+ $o = cleanfile($buildd, $o, $blddir);
$unified_info{sources}->{$ddest}->{$o} = 1;
$unified_info{sources}->{$o}->{$s} = 1;
} else {
@@ -1476,17 +1482,17 @@ EOF
foreach (keys %depends) {
my $dest = $_;
- my $ddest = cleanfile(catfile($buildd, $_), $blddir);
+ my $ddest = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$ddest}) {
$ddest = $unified_info{rename}->{$ddest};
}
foreach (@{$depends{$dest}}) {
- my $d = cleanfile(catfile($sourced, $_), $blddir);
+ my $d = cleanfile($sourced, $_, $blddir);
# If it isn't found in the source, let's assume it's generated
# and that the Makefile template has the lines
if (! -f $d) {
- $d = cleanfile(catfile($buildd, $_), $blddir);
+ $d = cleanfile($buildd, $_, $blddir);
}
# Take note if the file to depend on is being renamed
if ($unified_info{rename}->{$d}) {
@@ -1505,12 +1511,12 @@ EOF
foreach (keys %includes) {
my $dest = $_;
- my $ddest = cleanfile(catfile($buildd, $_), $blddir);
+ my $ddest = cleanfile($buildd, $_, $blddir);
if ($unified_info{rename}->{$ddest}) {
$ddest = $unified_info{rename}->{$ddest};
}
foreach (@{$includes{$dest}}) {
- my $i = cleandir(catdir($sourced, $_), $blddir);
+ my $i = cleandir($sourced, $_, $blddir);
push @{$unified_info{includes}->{$ddest}}, $i
unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}};
}
@@ -2206,6 +2212,23 @@ sub print_table_entry
# Utility routines ###################################################
+# On VMS, if the given file is a logical name, File::Spec::Functions
+# will consider it an absolute path. There are cases when we want a
+# purely syntactic check without checking the environment.
+sub isabsolute {
+ my $file = shift;
+
+ # On non-platforms, we just use file_name_is_absolute().
+ return file_name_is_absolute($file) unless $^O eq "VMS";
+
+ # If the file spec includes a device or a directpry spec,
+ # file_name_is_absolute() is perfectly safe.
+ return file_name_is_absolute($file) if $file =~ m|[:\[]|;
+
+ # Here, we know the given file spec isn't absolute
+ return 0;
+}
+
# Makes a directory absolute and cleans out /../ in paths like foo/../bar
# On some platforms, this uses rel2abs(), while on others, realpath() is used.
# realpath() requires that at least all path components except the last is an
diff --git a/apps/build.info b/apps/build.info
index 8615f2f..f365aee 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,4 +1,4 @@
-{- use File::Spec::Functions qw/catdir abs2rel/; -}
+{- use File::Spec::Functions qw/catdir rel2abs/; -}
PROGRAMS=openssl
SOURCE[openssl]=\
openssl.c \
@@ -10,7 +10,7 @@ SOURCE[openssl]=\
srp.c ts.c verify.c version.c x509.c rehash.c \
apps.c opt.c s_cb.c s_socket.c \
app_rand.c
-INCLUDE[openssl]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[openssl]=../libssl
SCRIPTS=CA.pl
diff --git a/build.info b/build.info
index 043947c..a518efe 100644
--- a/build.info
+++ b/build.info
@@ -1,7 +1,7 @@
-{- use File::Spec::Functions qw/catdir abs2rel/; -}
+{- use File::Spec::Functions qw/catdir rel2abs/; -}
LIBS=libcrypto libssl
ORDINALS[libcrypto]=crypto
ORDINALS[libssl]=ssl
-INCLUDE[libcrypto]={- catdir(abs2rel($builddir,$sourcedir),"include") -} . crypto/include include
-INCLUDE[libssl]={- catdir(abs2rel($builddir,$sourcedir),"include") -} . include
+INCLUDE[libcrypto]={- rel2abs(catdir($builddir,"include")) -} . crypto/include include
+INCLUDE[libssl]={- rel2abs(catdir($builddir,"include")) -} . include
DEPEND[libssl]=libcrypto
diff --git a/engines/build.info b/engines/build.info
index 88c5bf7..0c8e04b 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -1,4 +1,4 @@
-{- use File::Spec::Functions qw/:DEFAULT abs2rel/; -}
+{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}
IF[{- $config{no_shared} -}]
LIBS=../libcrypto
SOURCE[../libcrypto]=\
@@ -9,14 +9,14 @@ ELSE
ENGINES=libpadlock libcapi libdasync libossltest
SOURCE[libpadlock]=e_padlock.c {- $target{padlock_asm_src} -}
DEPEND[libpadlock]=../libcrypto
- INCLUDE[libpadlock]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+ INCLUDE[libpadlock]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libcapi]=e_capi.c
DEPEND[libcapi]=../libcrypto
- INCLUDE[libcapi]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+ INCLUDE[libcapi]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libdasync]=e_dasync.c
DEPEND[libdasync]=../libcrypto
- INCLUDE[libdasync]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+ INCLUDE[libdasync]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libossltest]=e_ossltest.c
DEPEND[libossltest]=../libcrypto
- INCLUDE[libossltest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+ INCLUDE[libossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
ENDIF
diff --git a/test/build.info b/test/build.info
index 5b696c5..bf9fead 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,4 +1,4 @@
-{- use File::Spec::Functions qw/catdir abs2rel/; -}
+{- use File::Spec::Functions qw/catdir rel2abs/; -}
PROGRAMS=\
nptest bntest \
ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
@@ -16,193 +16,193 @@ PROGRAMS=\
dtlsv1listentest
SOURCE[nptest]=nptest.c
-INCLUDE[nptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[nptest]=../libcrypto
SOURCE[bntest]=bntest.c
-INCLUDE[bntest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../crypto/include ../include
+INCLUDE[bntest]={- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
DEPEND[bntest]=../libcrypto
SOURCE[ectest]=ectest.c
-INCLUDE[ectest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[ectest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ectest]=../libcrypto
SOURCE[ecdsatest]=ecdsatest.c
-INCLUDE[ecdsatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[ecdsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ecdsatest]=../libcrypto
SOURCE[ecdhtest]=ecdhtest.c
-INCLUDE[ecdhtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[ecdhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ecdhtest]=../libcrypto
SOURCE[gmdifftest]=gmdifftest.c
-INCLUDE[gmdifftest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[gmdifftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[gmdifftest]=../libcrypto
SOURCE[pbelutest]=pbelutest.c
-INCLUDE[pbelutest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[pbelutest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[pbelutest]=../libcrypto
SOURCE[ideatest]=ideatest.c
-INCLUDE[ideatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[ideatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ideatest]=../libcrypto
SOURCE[md2test]=md2test.c
-INCLUDE[md2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[md2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md2test]=../libcrypto
SOURCE[md4test]=md4test.c
-INCLUDE[md4test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[md4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md4test]=../libcrypto
SOURCE[md5test]=md5test.c
-INCLUDE[md5test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[md5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md5test]=../libcrypto
SOURCE[hmactest]=hmactest.c
-INCLUDE[hmactest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[hmactest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[hmactest]=../libcrypto
SOURCE[wp_test]=wp_test.c
-INCLUDE[wp_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[wp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[wp_test]=../libcrypto
SOURCE[rc2test]=rc2test.c
-INCLUDE[rc2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[rc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc2test]=../libcrypto
SOURCE[rc4test]=rc4test.c
-INCLUDE[rc4test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[rc4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc4test]=../libcrypto
SOURCE[rc5test]=rc5test.c
-INCLUDE[rc5test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[rc5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc5test]=../libcrypto
SOURCE[destest]=destest.c
-INCLUDE[destest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[destest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[destest]=../libcrypto
SOURCE[sha1test]=sha1test.c
-INCLUDE[sha1test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[sha1test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha1test]=../libcrypto
SOURCE[sha256t]=sha256t.c
-INCLUDE[sha256t]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[sha256t]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha256t]=../libcrypto
SOURCE[sha512t]=sha512t.c
-INCLUDE[sha512t]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[sha512t]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha512t]=../libcrypto
SOURCE[mdc2test]=mdc2test.c
-INCLUDE[mdc2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[mdc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[mdc2test]=../libcrypto
SOURCE[rmdtest]=rmdtest.c
-INCLUDE[rmdtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[rmdtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rmdtest]=../libcrypto
SOURCE[randtest]=randtest.c
-INCLUDE[randtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[randtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[randtest]=../libcrypto
SOURCE[dhtest]=dhtest.c
-INCLUDE[dhtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[dhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[dhtest]=../libcrypto
SOURCE[enginetest]=enginetest.c
-INCLUDE[enginetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[enginetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[enginetest]=../libcrypto
SOURCE[casttest]=casttest.c
-INCLUDE[casttest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[casttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[casttest]=../libcrypto
SOURCE[bftest]=bftest.c
-INCLUDE[bftest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[bftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[bftest]=../libcrypto
SOURCE[ssltest]=ssltest.c
-INCLUDE[ssltest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[ssltest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[ssltest]=../libcrypto ../libssl
SOURCE[dsatest]=dsatest.c
-INCLUDE[dsatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[dsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[dsatest]=../libcrypto
SOURCE[exptest]=exptest.c
-INCLUDE[exptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[exptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[exptest]=../libcrypto
SOURCE[rsa_test]=rsa_test.c
-INCLUDE[rsa_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[rsa_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[rsa_test]=../libcrypto
SOURCE[evp_test]=evp_test.c
-INCLUDE[evp_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[evp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[evp_test]=../libcrypto
SOURCE[evp_extra_test]=evp_extra_test.c
-INCLUDE[evp_extra_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[evp_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[evp_extra_test]=../libcrypto
SOURCE[igetest]=igetest.c
-INCLUDE[igetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[igetest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[igetest]=../libcrypto
SOURCE[jpaketest]=jpaketest.c
-INCLUDE[jpaketest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[jpaketest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[jpaketest]=../libcrypto
SOURCE[v3nametest]=v3nametest.c
-INCLUDE[v3nametest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[v3nametest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[v3nametest]=../libcrypto
SOURCE[danetest]=danetest.c
-INCLUDE[danetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[danetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[danetest]=../libcrypto ../libssl
SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
-INCLUDE[heartbeat_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[heartbeat_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[heartbeat_test]=../libcrypto ../libssl
SOURCE[p5_crpt2_test]=p5_crpt2_test.c
-INCLUDE[p5_crpt2_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[p5_crpt2_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[p5_crpt2_test]=../libcrypto
SOURCE[constant_time_test]=constant_time_test.c
-INCLUDE[constant_time_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[constant_time_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[constant_time_test]=../libcrypto
SOURCE[verify_extra_test]=verify_extra_test.c
-INCLUDE[verify_extra_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[verify_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[verify_extra_test]=../libcrypto
SOURCE[clienthellotest]=clienthellotest.c
-INCLUDE[clienthellotest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[clienthellotest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[clienthellotest]=../libcrypto ../libssl
SOURCE[packettest]=packettest.c
-INCLUDE[packettest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[packettest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[packettest]=../libcrypto
SOURCE[asynctest]=asynctest.c
-INCLUDE[asynctest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[asynctest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[asynctest]=../libcrypto
SOURCE[secmemtest]=secmemtest.c
-INCLUDE[secmemtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[secmemtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[secmemtest]=../libcrypto
SOURCE[srptest]=srptest.c
-INCLUDE[srptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[srptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[srptest]=../libcrypto
SOURCE[memleaktest]=memleaktest.c
-INCLUDE[memleaktest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
+INCLUDE[memleaktest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[memleaktest]=../libcrypto
SOURCE[dtlsv1listentest]=dtlsv1listentest.c
-INCLUDE[dtlsv1listentest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
+INCLUDE[dtlsv1listentest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[dtlsv1listentest]=../libssl
More information about the openssl-commits
mailing list