[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dff298135b9b8bbaac1f452a219bb446e50728d1 (commit)
       via  fb82cbfe3da846d61e1d4c6d14bf7f4111cccbb2 (commit)
      from  ca811248d838058c13236a6c3b688e0ac98c02c8 (commit)


- Log -----------------------------------------------------------------
commit dff298135b9b8bbaac1f452a219bb446e50728d1
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 5 16:21:59 2019 +0100

    Rework build: small correction in unix-Makefile.tmpl
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8162)

commit fb82cbfe3da846d61e1d4c6d14bf7f4111cccbb2
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 4 21:28:43 2019 +0100

    Rework build: add special cases for AIX
    
    When reworking the way library file names and extensions were formed,
    AIX was lost in the process.  This restores the previous
    functionality.
    
    Fixes #8156
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8162)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf       |  3 +--
 Configurations/platform/AIX.pm    | 27 +++++++++++++++++++++++++++
 Configurations/unix-Makefile.tmpl |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 Configurations/platform/AIX.pm

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 859e3d9..1e49118 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1100,8 +1100,7 @@ my %targets = (
         module_ldflags   => "-Wl,-G,-bsymbolic,-bexpall",
         shared_ldflag    => "-Wl,-G,-bsymbolic",
         shared_defflag   => "-Wl,-bE:",
-        lib_extension    => shared("_a.a"),
-        shared_extension_simple => shared(".a"),
+        perl_platform    => 'AIX',
     },
     "aix-gcc" => {
         inherit_from     => [ "aix-common", asm("ppc32_asm") ],
diff --git a/Configurations/platform/AIX.pm b/Configurations/platform/AIX.pm
new file mode 100644
index 0000000..f441c15
--- /dev/null
+++ b/Configurations/platform/AIX.pm
@@ -0,0 +1,27 @@
+package platform::AIX;
+
+use strict;
+use warnings;
+use Carp;
+
+use vars qw(@ISA);
+
+require platform::Unix;
+ at ISA = qw(platform::Unix);
+
+# Assume someone set @INC right before loading this module
+use configdata;
+
+sub shlibextsimple      { '.a' }
+
+# In shared mode, the default static library names clashes with the final
+# "simple" full shared library name, so we add '_a' to the basename of the
+# static libraries in that case.
+sub staticname {
+    # Non-installed libraries are *always* static, and their names remain
+    # the same, except for the mandatory extension
+    my $in_libname = platform::BASE->staticname($_[1]);
+    return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst};
+
+    return platform::BASE->staticname($_[1]) . '_a';
+}
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 41794f0..7705b03 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1194,7 +1194,7 @@ EOF
           push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
       }
       my $linkflags = join("", map { "-L$_ " } @linkdirs);
-      my $linklibs = join("", map { if ($_ =~ s/\.a$//) {
+      my $linklibs = join("", map { if ($_ =~ m/\.a$/) {
                                         " ".platform->staticlib($_);
                                     } else {
                                         my $f = basename($_);