[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Feb 9 13:28:07 UTC 2018
The branch master has been updated
via 368297d17352c7eb30efff443509caf7cf59f65f (commit)
from f3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff (commit)
- Log -----------------------------------------------------------------
commit 368297d17352c7eb30efff443509caf7cf59f65f
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Feb 8 23:26:22 2018 +0100
Configuration: move the handling of zlib_include to config files
It was a bit absurd to have this being specially handled in the build
file templates, especially that we have the 'includes' attribute.
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5296)
-----------------------------------------------------------------------
Summary of changes:
Configurations/00-base-templates.conf | 18 ++++++++++++++++++
Configurations/10-main.conf | 11 ++++++-----
Configurations/descrip.mms.tmpl | 11 ++---------
Configurations/unix-Makefile.tmpl | 5 -----
Configurations/windows-makefile.tmpl | 5 -----
5 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 0d0f8b8..951aeaa 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -7,6 +7,7 @@ my %targets=(
cppflags => "",
lflags => "",
defines => [],
+ includes => [],
thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [],
@@ -70,6 +71,13 @@ my %targets=(
push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
return [ @defs ];
},
+ includes =>
+ sub {
+ my @incs = ();
+ push @incs, $withargs{zlib_include}
+ if !$disabled{zlib} && $withargs{zlib_include};
+ return [ @incs ];
+ },
},
BASE_unix => {
@@ -129,6 +137,16 @@ my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
+ includes =>
+ add(sub {
+ my @incs = ();
+ # GNV$ZLIB_INCLUDE is the standard logical name for later
+ # zlib incarnations.
+ push @incs, 'GNV$ZLIB_INCLUDE:'
+ if !$disabled{zlib} && !$withargs{zlib_include};
+ return [ @incs ];
+ }),
+
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 70b0104..b17a780 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -580,7 +580,7 @@ my %targets = (
cc => "gcc",
cflags => "-O3",
cppflags => "-D_ENDIAN -DBN_DIV2W -D_POSIX_SOURCE -D_SOCKET_SOURCE",
- includes => [ "/SYSLOG/PUB" ],
+ includes => add("/SYSLOG/PUB"),
sys_id => "MPE",
lflags => add("-L/SYSLOG/PUB"),
ex_libs => add("-lsyslog -lsocket -lcurses"),
@@ -1444,10 +1444,11 @@ my %targets = (
"NO_CHMOD", "OPENSSL_SMALL_FOOTPRINT" ],
debug => [ "DEBUG", "_DEBUG" ]),
includes =>
- combine(sub { defined(env('WCECOMPAT'))
- ? '$(WCECOMPAT)/include' : (); },
- sub { defined(env('PORTSDK_LIBPATH'))
- ? '$(PORTSDK_LIBPATH)/../../include' : (); }),
+ add(combine(sub { defined(env('WCECOMPAT'))
+ ? '$(WCECOMPAT)/include' : (); },
+ sub { defined(env('PORTSDK_LIBPATH'))
+ ? '$(PORTSDK_LIBPATH)/../../include'
+ : (); })),
lflags => add(combine("/nologo /opt:ref",
sub { vc_wince_info()->{lflags}; },
sub { defined(env('PORTSDK_LIBPATH'))
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 2b2e4d0..e3b1700 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -640,13 +640,6 @@ EOF
$cflags .= '/DEFINE=('.$defines.')';
$cflags .= "/INCLUDE=('tmp_includes')";
- my @incs = ();
- push @incs, @{$args{incs}} if @{$args{incs}};
- unless ($disabled{zlib}) {
- # GNV$ZLIB_INCLUDE is the standard logical name for later zlib
- # incarnations.
- push @incs, ($withargs{zlib_include} || 'GNV$ZLIB_INCLUDE:');
- }
# We create a logical name TMP_INCLUDES: to hold the list of internal
# includes. However, we cannot use it directly, as logical names can't
# hold zero entries, so we also create a symbol with the same name and
@@ -666,13 +659,13 @@ EOF
."\n\t".$incs_add;
my $incs_off = 'DELETE/SYMBOL/LOCAL tmp_includes'
."\n\t".'DELETE/SYMBOL/LOCAL tmp_add';
- if (@incs) {
+ if (@{$args{incs}}) {
$incs_on =
'DEFINE tmp_includes '
.join(",-\n\t\t\t", map {
file_name_is_absolute($_)
? $_ : catdir($backward,$_)
- } @incs)
+ } @{$args{incs}})
."\n\t".$incs_on
."\n\t".'IF tmp_includes .NES. "" THEN tmp_includes = "," + tmp_includes'
."\n\t".'tmp_includes = "tmp_includes:" + tmp_includes';
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 9e05fd1..3c80fec 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -891,11 +891,6 @@ EOF
my $srcs = join(" ", @srcs);
my $deps = join(" ", @srcs, @{$args{deps}});
my $incs = join("", map { " -I".$_ } @{$args{incs}});
- unless ($disabled{zlib}) {
- if ($withargs{zlib_include}) {
- $incs .= " -I".$withargs{zlib_include};
- }
- }
my $cmd = '$(CC)';
my $cmdflags = '$(CFLAGS)';
my $cmdcompile = ' -c';
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 0abe6ea..86bc086 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -466,11 +466,6 @@ EOF
my $srcs = '"'.join('" "', @srcs).'"';
my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"';
my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}});
- unless ($disabled{zlib}) {
- if ($withargs{zlib_include}) {
- $incs .= ' /I "'.$withargs{zlib_include}.'"';
- }
- }
my $cflags = '$(CFLAGS)';
$cflags .= { lib => ' $(LIB_CFLAGS)',
dso => ' $(DSO_CFLAGS)',
More information about the openssl-commits
mailing list