Browse Source

Configure: handle undefined shared_target.

Some very basic config targets don't defined the 'shared_target'
attribute at all.  This wasn't handled well enough in Configure.
This also cleans away an explicit reference to the ossltest engine in
Configurations/unix-Makefile.tmpl, which isn't necessary since the
build.info attributes were added.

Fixes openssl/web#197

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13031)
master
Richard Levitte 2 years ago
parent
commit
e1f5a92df4
2 changed files with 2 additions and 8 deletions
  1. +0
    -6
      Configurations/unix-Makefile.tmpl
  2. +2
    -2
      Configure

+ 0
- 6
Configurations/unix-Makefile.tmpl View File

@ -733,9 +733,6 @@ uninstall_engines:
@set -e; for e in dummy $(INSTALL_ENGINES); do \
if [ "$$e" = "dummy" ]; then continue; fi; \
fn=`basename $$e`; \
if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \
continue; \
fi; \
$(ECHO) "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \
$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \
done
@ -760,9 +757,6 @@ uninstall_modules:
@set -e; for e in dummy $(INSTALL_MODULES); do \
if [ "$$e" = "dummy" ]; then continue; fi; \
fn=`basename $$e`; \
if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \
continue; \
fi; \
$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \
$(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \
done


+ 2
- 2
Configure View File

@ -579,7 +579,7 @@ my @disable_cascades = (
# or modules.
"pic" => [ "shared", "module" ],
"module" => [ "fips" ],
"module" => [ "fips", "dso" ],
"engine" => [ grep /eng$/, @disablables ],
"hw" => [ "padlockeng" ],
@ -1444,7 +1444,7 @@ unless($disabled{threads}) {
}
my $no_shared_warn=0;
if ($target{shared_target} eq "")
if (($target{shared_target} // '') eq "")
{
$no_shared_warn = 1
if (!$disabled{shared} || !$disabled{"dynamic-engine"});


Loading…
Cancel
Save