diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-23 17:59:39 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-25 10:08:41 +0200 |
| commit | 294e380220c5ab83c05f9c501120a6296f88abdc (patch) | |
| tree | c1cf8b11d8b8eac7bd3e52ebbc82eb2527077cf4 /Configurations | |
| parent | e07a7892ee1bb2a2b697d4ad636b02bdc742fa10 (diff) | |
Configuration: Don't have shared libraries depend on themselves
The NonStop config attributes mean that there's no separate "simple"
and "full" shared library name, they are the same. Because we assumed
that they would always differ, we ended up with this dependency:
libcrypto.so: libcrypto.so
A simple fix was all that was needed to clear that.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12960)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 20fe46e337..ac19141a95 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1472,19 +1472,22 @@ EOF my $fullobjs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @fullobjs)); - my $recipe = <<"EOF"; + my $recipe = ''; + + if ($simple ne $full) { + if (sharedaix()) { + $recipe .= <<"EOF"; $simple: $full -EOF - if (sharedaix()) { - $recipe .= <<"EOF"; rm -f $simple && \\ \$(AR) r $simple $full EOF - } elsif ($simple ne $full) { - $recipe .= <<"EOF"; + } else { + $recipe .= <<"EOF"; +$simple: $full rm -f $simple && \\ ln -s $full $simple EOF + } } $recipe .= <<"EOF"; $full: $fulldeps |