The branch master has been updated
via 721f9058b398f05611c1d5ac4ff7cc464695dd1e (commit)
via 00b0d6632bd4c0af84dc4e9e66d17a989ad58d00 (commit)
via 93e3d3f3ff5013a900e1719bfc03794deb8db099 (commit)
via 36a3090904877cde2a793488b8ef640c9d803fbd (commit)
via 22bfe05efdda4239b200453b09ed0649319399a4 (commit)
via 84af1bae68950a6993b56e39beff905d23fb74c8 (commit)
via 9e04edf2f309e7edc3f4c9a09d444b2fd23a1e46 (commit)
from d784bcffa3dcd7ac4a0c77bfac4e686dcb771bd9 (commit)
- Log -----------------------------------------------------------------
commit 721f9058b398f05611c1d5ac4ff7cc464695dd1e
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 14:12:35 2016 +0100
Clean away $no_dso since with have $disabled{dso}
Reviewed-by: Rich Salz <[email protected]>
commit 00b0d6632bd4c0af84dc4e9e66d17a989ad58d00
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 14:10:45 2016 +0100
Clean away $no_asm since with have $disabled{asm}
Reviewed-by: Rich Salz <[email protected]>
commit 93e3d3f3ff5013a900e1719bfc03794deb8db099
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 14:06:16 2016 +0100
Clean away $no_rfc3779 since we don't appear to use it at all
Reviewed-by: Rich Salz <[email protected]>
commit 36a3090904877cde2a793488b8ef640c9d803fbd
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 14:04:45 2016 +0100
Clean away $zlib since with have $disabled{zlib}
Reviewed-by: Rich Salz <[email protected]>
commit 22bfe05efdda4239b200453b09ed0649319399a4
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 14:03:23 2016 +0100
Clean away $no_threads since we have $disabled{threads}
Reviewed-by: Rich Salz <[email protected]>
commit 84af1bae68950a6993b56e39beff905d23fb74c8
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 13:52:46 2016 +0100
Clean away $config{no_shared} since we have $disabled{shared}
Reviewed-by: Rich Salz <[email protected]>
commit 9e04edf2f309e7edc3f4c9a09d444b2fd23a1e46
Author: Richard Levitte <[email protected]>
Date: Mon Feb 22 13:45:46 2016 +0100
Expose %disables to the perl fragments in build.info files.
This way, we can use them as conditions instead of relying to more or
less obscure aliases in %config or variables directly in Configure.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 2 +-
Configurations/README | 2 +-
Configurations/common.tmpl | 2 +-
Configurations/descrip.mms.tmpl | 16 ++++-----
Configurations/unix-Makefile.tmpl | 16 ++++-----
Configure | 68 ++++++++++++++++++---------------------
Makefile.in | 2 +-
VMS/openssl_shutdown.com.in | 4 +--
VMS/openssl_startup.com.in | 4 +--
9 files changed, 55 insertions(+), 61 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 312aac5..a3dfcfd 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1163,7 +1163,7 @@
#### MinGW
"mingw" => {
inherit_from => [ asm("x86_asm"),
- sub { $config{no_shared} ? () : "x86_uplink" } ],
+ sub { $disabled{shared} ? () : "x86_uplink" } ],
cc => "gcc",
cflags => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE
-D_UNICODE -m32 -Wall",
debug_cflags => "-g -O0",
diff --git a/Configurations/README b/Configurations/README
index 454c8f3..c031884 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -430,7 +430,7 @@ example, the above would have "something" used, since 1 is
true.
Together with the use of Text::Template, this can be used as
conditions based on something in the passed variables, for example:
- IF[{- $config{no_shared} -}]
+ IF[{- $disabled{shared} -}]
LIBS=libcrypto
SOURCE[libcrypto]=...
ELSE
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl
index 196441c..f8f37ae 100644
--- a/Configurations/common.tmpl
+++ b/Configurations/common.tmpl
@@ -54,7 +54,7 @@
# built.
sub dolib {
my $lib = shift;
- if (!$config{no_shared}) {
+ unless ($disabled{shared}) {
my %ordinals =
$unified_info{ordinals}->{$lib}
? (ordinals => $unified_info{ordinals}->{$lib}) : ();
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 279400c..c2eed11 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -296,12 +296,12 @@ install_dev : check_INSTALLTOP
{- join("\n ",
map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }
@{$unified_info{libraries}}) -}
- @ {- output_off() if $config{no_shared}; "" -} !
+ @ {- output_off() if $disabled{shared}; "" -} !
{- join("\n ",
map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" }
map { $unified_info{sharednames}->{$_} || () }
@{$unified_info{libraries}}) -}
- @ {- output_on() if $config{no_shared}; "" -} !
+ @ {- output_on() if $disabled{shared}; "" -} !
install_runtime : check_INSTALLTOP
@ WRITE SYS$OUTPUT "*** Installing runtime files"
@@ -363,7 +363,7 @@ vmsconfig.pm : configdata.pm
WRITE CONFIG "our %config = ("
WRITE CONFIG " target => '{- $config{target} -}',"
WRITE CONFIG " version => '$(MAJOR).$(MINOR)',"
- WRITE CONFIG " no_shared => '","{- $config{no_shared} -}","',"
+ WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","',"
WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)',"
WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)',"
WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","',"
@@ -470,10 +470,10 @@ EOF
my $libn = basename($lib);
(my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib//i;
my @deps = map {
- $config{no_shared} ? $_.".OLB"
+ $disabled{shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @deps);
- my $shlib_target = $config{no_shared} ? "" : $target{shared_target};
+ my $shlib_target = $disabled{shared} ? "" : $target{shared_target};
my $ordinalsfile = defined($args{ordinals}) ? $args{ordinals}->[1] : "";
my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "engine.opt")),
@@ -522,10 +522,10 @@ EOF
(my $libn_nolib = $libn) =~ s/^lib//;
my @objs = map { "$_.OBJ" } @{$args{objs}};
my @deps = map {
- $config{no_shared} ? $_.".OLB"
+ $disabled{shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @objs, @deps);
- my $shlib_target = $config{no_shared} ? "" : $target{shared_target};
+ my $shlib_target = $disabled{shared} ? "" : $target{shared_target};
my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "engine.opt")),
rel2abs($config{builddir}));
@@ -572,7 +572,7 @@ EOF
my $binn = basename($bin);
my @objs = map { "$_.OBJ" } @{$args{objs}};
my @deps = map {
- $config{no_shared} ? $_.".OLB"
+ $disabled{shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @objs, @deps);
# The "[]" hack is because in .OPT files, each line inherits the
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index b591c4d..339c733 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -34,12 +34,12 @@
# removed. On some systems, they may therefore return the exact same
# string.
sub shlib {
- return () if $config{no_shared};
+ return () if $disabled{shared};
my $lib = shift;
return $unified_info{sharednames}->{$lib} . $shlibext;
}
sub shlib_simple {
- return () if $config{no_shared};
+ return () if $disabled{shared};
my $lib = shift;
if (windowsdll()) {
@@ -320,7 +320,7 @@ install_dev:
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done
- @ : {- output_off() if $config{no_shared}; "" -}
+ @ : {- output_off() if $disabled{shared}; "" -}
@set -e; for s in $(SHLIB_INFO); do \
s1=`echo "$$s" | cut -f1 -d";"`; \
s2=`echo "$$s" | cut -f2 -d";"`; \
@@ -344,7 +344,7 @@ install_dev:
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
: {- output_on() unless windowsdll(); "" -}; \
done
- @ : {- output_on() if $config{no_shared}; "" -}
+ @ : {- output_on() if $disabled{shared}; "" -}
@$(PERL) $(SRCDIR)/util/mkdir-p.pl
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@echo "install libcrypto.pc ->
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@@ -371,7 +371,7 @@ uninstall_dev:
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done
- @ : {- output_off() if $config{no_shared}; "" -}
+ @ : {- output_off() if $disabled{shared}; "" -}
@set -e; for s in $(SHLIB_INFO); do \
s1=`echo "$$s" | cut -f1 -d";"`; \
s2=`echo "$$s" | cut -f2 -d";"`; \
@@ -389,7 +389,7 @@ uninstall_dev:
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
: {- output_on() unless windowsdll(); "" -}; \
done
- @ : {- output_on() if $config{no_shared}; "" -}
+ @ : {- output_on() if $disabled{shared}; "" -}
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc"
@@ -832,7 +832,7 @@ configdata.pm: {- $config{build_file_template} -}
$(SRCDIR)/Configure $(SRCDIR)/
# Helper function to figure out dependencies on libraries
# It takes a list of library names and outputs a list of dependencies
sub compute_lib_depends {
- if ($config{no_shared}) {
+ if ($disabled{shared}) {
return map { $_.$libext } @_;
}
@@ -969,7 +969,7 @@ EOF
$d = "." if $d eq $f;
(my $l = $f) =~ s/^lib//;
" -L$d -l$l" } @{$args{deps}});
- my $shlib_target = $config{no_shared} ? "" : $target{shared_target};
+ my $shlib_target = $disabled{shared} ? "" : $target{shared_target};
return <<"EOF";
$bin$exeext: $objs $deps
\$(RM) $bin$exeext
diff --git a/Configure b/Configure
index 6b7165f..82086ed 100755
--- a/Configure
+++ b/Configure
@@ -208,13 +208,7 @@ $config{cross_compile_prefix}="";
$config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
my $nofipscanistercheck=0;
$config{baseaddr}="0xFB00000";
-my $no_threads=0;
my $threads=0;
-$config{no_shared}=0; # but "no-shared" is default
-my $zlib=1; # but "no-zlib" is default
-my $no_rfc3779=0;
-my $no_asm=0;
-my $no_dso=0;
my $default_ranlib;
$config{fips}=0;
@@ -334,20 +328,20 @@ my @deprecated_disablables = (
# All of the following is disabled by default (RC5 was enabled before 0.9.8):
-my %disabled = ( # "what" => "comment"
- "ec_nistp_64_gcc_128" => "default",
- "egd" => "default",
- "md2" => "default",
- "rc5" => "default",
- "sctp" => "default",
- "shared" => "default",
- "ssl-trace" => "default",
- "static-engine" => "default",
- "unit-test" => "default",
- "zlib" => "default",
- "crypto-mdebug" => "default",
- "heartbeats" => "default",
- );
+our %disabled = ( # "what" => "comment"
+ "ec_nistp_64_gcc_128" => "default",
+ "egd" => "default",
+ "md2" => "default",
+ "rc5" => "default",
+ "sctp" => "default",
+ "shared" => "default",
+ "ssl-trace" => "default",
+ "static-engine" => "default",
+ "unit-test" => "default",
+ "zlib" => "default",
+ "crypto-mdebug" => "default",
+ "heartbeats" => "default",
+ );
# Note: => pair form used for aesthetics, not to truly make a hash table
my @disable_cascades = (
@@ -780,15 +774,15 @@ foreach (sort (keys %disabled))
printf " no-%-12s %-10s", $_, "[$disabled{$_}]";
if (/^dso$/)
- { $no_dso = 1; }
+ { }
elsif (/^threads$/)
- { $no_threads = 1; }
+ { }
elsif (/^shared$/)
- { $config{no_shared} = 1; }
+ { }
elsif (/^pic$/)
{ }
elsif (/^zlib$/)
- { $zlib = 0; }
+ { }
elsif (/^dynamic-engine$/)
{ }
elsif (/^zlib-dynamic$/)
@@ -813,7 +807,6 @@ foreach (sort (keys %disabled))
print " OPENSSL_NO_$ALGO";
if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR";
}
- elsif (/^asm$/) { $no_asm = 1; }
}
else
{
@@ -920,7 +913,7 @@ if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1`
=~ m/-mno-cygwin/m)
$target{shared_ldflag} .= " -mno-cygwin";
}
-if ($target =~ /linux.*-mips/ && !$no_asm && $user_cflags !~ /-m(ips|arch=)/) {
+if ($target =~ /linux.*-mips/ && !$disabled{asm} && $user_cflags !~
/-m(ips|arch=)/) {
# minimally required architecture flags for assembly modules
$config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/);
$config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/);
@@ -936,7 +929,7 @@ my $no_user_defines=0;
# has support compiled in for them. Currently each method is enabled
# by a define "DSO_<name>" ... we translate the "dso_scheme" config
# string entry into using the following logic;
-if (!$no_dso && $target{dso_scheme} ne "")
+if (!$disabled{dso} && $target{dso_scheme} ne "")
{
$target{dso_scheme} =~ tr/[a-z]/[A-Z]/;
if ($target{dso_scheme} eq "DLFCN")
@@ -957,7 +950,7 @@ if (!$no_dso && $target{dso_scheme} ne "")
my $thread_cflags = "";
my @thread_defines;
-if ($target{thread_cflag} ne "(unknown)" && !$no_threads)
+if ($target{thread_cflag} ne "(unknown)" && !$disabled{threads})
{
# If we know how to do it, support threads by default.
$threads = 1;
@@ -983,7 +976,7 @@ else
$config{ex_libs}="$libs$config{ex_libs}" if ($libs ne "");
-if ($no_asm)
+if ($disabled{asm})
{
@{$config{defines}} = grep !/^[BL]_ENDIAN$/, @{$config{defines}}
if ($config{fips});
@@ -996,7 +989,7 @@ if ($threads)
push @{$config{openssl_thread_defines}}, @thread_defines;
}
-if ($zlib)
+unless ($disabled{zlib})
{
push @{$config{defines}}, "ZLIB";
if (defined($disabled{"zlib-dynamic"}))
@@ -1024,9 +1017,9 @@ if (defined($disabled{"deprecated"})) {
if ($target{shared_target} eq "")
{
$no_shared_warn = 1
- if ((!$config{no_shared} || !$disabled{"dynamic-engine"})
+ if ((!$disabled{shared} || !$disabled{"dynamic-engine"})
&& !$config{fips});
- $config{no_shared} = 1;
+ $disabled{shared} = "no-shared-target";
$disabled{pic} = $disabled{shared} = $disabled{"dynamic-engine"} =
"no-shared-target";
}
@@ -1060,7 +1053,7 @@ if ($target{ranlib} eq "")
$target{ranlib} = $default_ranlib;
}
-if (!$no_asm) {
+unless ($disabled{asm}) {
$target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if
($config{processor} eq "386");
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
@@ -1301,6 +1294,7 @@ if ($builder eq "unified") {
split /^/m,
$template->fill_in(HASH => { config => \%config,
target => \%target,
+ disabled => \%disabled,
builddir => abs2rel($buildd, $blddir),
sourcedir => abs2rel($sourced,
$blddir),
buildtop => abs2rel($blddir, $blddir),
@@ -1446,7 +1440,7 @@ EOF
push @{$unified_info{rawlines}}, @rawlines;
- if (!$config{no_shared}) {
+ unless ($disabled{shared}) {
# Check sharednames.
foreach (keys %sharednames) {
my $dest = cleanfile($buildd, $_, $blddir);
@@ -1875,7 +1869,7 @@ print <<"EOF";
Configured for $target.
EOF
-print <<"EOF" if (!$no_threads && !$threads);
+print <<"EOF" if (!$disabled{threads} && !$threads);
The library could not be configured for supporting multi-threaded
applications as the compiler options required on this system are not known.
@@ -1934,14 +1928,14 @@ exit(0);
# Configuration file reading #########################################
# Helper function to implement conditional inheritance depending on the
-# value of $no_asm. Used in inherit_from values as follows:
+# value of $disabled{asm}. Used in inherit_from values as follows:
#
# inherit_from => [ "template", asm("asm_tmpl") ]
#
sub asm {
my @x = @_;
sub {
- $no_asm ? () : @x;
+ $disabled{asm} ? () : @x;
}
}
diff --git a/Makefile.in b/Makefile.in
index 9cca221..9513003 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,7 +193,7 @@ TOP= .
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
SHARED_SSL=libssl$(SHLIB_EXT)
-SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -}
+SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' unless $disabled{shared} -}
SHARED_CFLAG={- $target{shared_cflag} -}
SHARED_LDFLAG={- $target{shared_ldflag}
# Unlike other OSes (like Solaris, Linux, Tru64,
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 85cc26d..236979e 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -39,7 +39,7 @@ $ DEAS OSSL$LIB'v'
$ DEAS OSSL$SHARE'v'
$ DEAS OSSL$ENGINES'v'
$ DEAS OSSL$EXE'v'
-$ {- output_off() if $config{no_shared} -}
+$ {- output_off() if $disabled{shared} -}
$ {- join("\n\$ ", map { "DEAS $_'v'" } map {
$unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ IF P2 .NES. "NOALIASES"
@@ -51,7 +51,7 @@ $ DEAS OSSL$SHARE
$ DEAS OSSL$ENGINES
$ DEAS OSSL$EXE
$ DEAS OPENSSL
-$ {- output_off() if $config{no_shared} -}
+$ {- output_off() if $disabled{shared} -}
$ {- join("\n\$ ", map { "DEAS $_" } map {
$unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ ENDIF
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index a968b44..be3f385 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -88,7 +88,7 @@ $ DEF OSSL$LIB'v' OSSL$INSTROOT:['arch'.LIB]
$ DEF OSSL$SHARE'v' OSSL$INSTROOT:['arch'.LIB]
$ DEF OSSL$ENGINES'v' OSSL$INSTROOT:['arch'.ENGINES]
$ DEF OSSL$EXE'v' OSSL$INSTROOT:['arch'.EXE]
-$ {- output_off() if $config{no_shared} -}
+$ {- output_off() if $disabled{shared} -}
$ {- join("\n\$ ", map { "DEF $_'v' OSSL\$SHARE:$_" } map {
$unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ IF P2 .NES. "NOALIASES"
@@ -100,7 +100,7 @@ $ DEF OSSL$SHARE OSSL$SHARE'v'
$ DEF OSSL$ENGINES OSSL$ENGINES'v'
$ DEF OSSL$EXE OSSL$EXE'v'
$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
-$ {- output_off() if $config{no_shared} -}
+$ {- output_off() if $disabled{shared} -}
$ {- join("\n\$ ", map { "DEF $_ $_'v'" } map {
$unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ ENDIF
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
