Commit 0ef40b76 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configurations/10-main.conf: move hpux-shared flags to hpux-common. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6477)
parent 17e822e9

Configurations/10-main.conf

+12 −9
Original line number Diff line number Diff line
@@ -463,7 +463,10 @@ my %targets = ( 
        lib_cppflags     => "-DB_ENDIAN",

        thread_scheme    => "pthreads",

        dso_scheme       => "dlfcn",    # overridden in 32-bit PA-RISC builds

        shared_target    => "hpux-shared",

        shared_target    => "self",

        bin_lflags       => "-Wl,+s,+cdp,../:,+cdp,./:",

        shared_ldflag    => "-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:",

        shared_sonameflag=> "-Wl,+h,",

    },

    "hpux-parisc-gcc" => {

        inherit_from     => [ "hpux-common" ],
@@ -476,7 +479,7 @@ my %targets = ( 
        bn_ops           => "BN_LLONG RC4_CHAR",

        dso_scheme       => "dl",

        shared_cflag     => "-fPIC",

        shared_ldflag    => "-shared",

        shared_ldflag    => add_before("-shared"),

        shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",

    },

    "hpux-parisc1_1-gcc" => {
@@ -492,7 +495,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-pthread")),

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        shared_cflag     => "-fpic",

        shared_ldflag    => "-shared",

        shared_ldflag    => add_before("-shared"),

        shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/pa20_64",

    },
@@ -510,7 +513,7 @@ my %targets = ( 
        bn_ops           => "RC4_CHAR",

        dso_scheme       => "dl",

        shared_cflag     => "+Z",

        shared_ldflag    => "-b",

        shared_ldflag    => add_before("-b"),

        shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",

    },

    "hpux-parisc1_1-cc" => {
@@ -529,7 +532,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-lpthread")),

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        shared_cflag     => "+Z",

        shared_ldflag    => "-b",

        shared_ldflag    => add_before("-b"),

        shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/pa20_64",

    },
@@ -545,7 +548,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-lpthread")),

        bn_ops           => "SIXTY_FOUR_BIT",

        shared_cflag     => "+Z",

        shared_ldflag    => "-b",

        shared_ldflag    => add_before("-b"),

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/hpux32",

    },
@@ -559,7 +562,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-lpthread")),

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        shared_cflag     => "+Z",

        shared_ldflag    => "-b",

        shared_ldflag    => add_before("-b"),

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/hpux64",

    },
@@ -573,7 +576,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-pthread")),

        bn_ops           => "SIXTY_FOUR_BIT",

        shared_cflag     => "-fpic",

        shared_ldflag    => "-shared",

        shared_ldflag    => add_before("-shared"),

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/hpux32",

    },
@@ -586,7 +589,7 @@ my %targets = ( 
        ex_libs          => add("-ldl", threads("-pthread")),

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        shared_cflag     => "-fpic",

        shared_ldflag    => "-shared",

        shared_ldflag    => add_before("-shared"),

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "/hpux64",

    },

Configurations/shared-info.pl

+0 −5
Original line number Diff line number Diff line
@@ -86,9 +86,4 @@ my %shared_info; 
            shared_sonameflag => '-Wl,-soname=',

        };

    },

    'hpux-shared' => {

        bin_lflags        => '-Wl,+s,+cdp,../:,+cdp,./:',

        shared_ldflag     => '-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:',

        shared_sonameflag => '-Wl,+h,',

    },

);