projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Configure: print generic advice when dying
[openssl.git] / Configurations / 10-main.conf
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 152a37fa4e12ac981094c1f42943ae19b7c99a35..5cf345da0af09a9e1721f2cd657432631062c47d 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -17,7 +17,7 @@ sub vc_win64a_info {
                                 asflags   => "/c /Cp /Cx",
                                 asoutflag => "/Fo" };
         } else {
-            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $die->("NASM not found - make sure it's installed and available on %PATH%\n");
             $vc_win64a_info = { AS        => "{unknown}",
                                 ASFLAGS   => "",
                                 asflags   => "",
@@ -46,7 +46,7 @@ sub vc_win32_info {
                                asoutflag => "/Fo",
                                perlasm_scheme => "win32" };
         } else {
-            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $die->("NASM not found - make sure it's installed and available on %PATH%\n");
             $vc_win32_info = { AS        => "{unknown}",
                                ASFLAGS   => "",
                                asflags   => "",
@@ -232,7 +232,7 @@ my %targets = (
         ex_libs          => add(threads("-pthread")),
         bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
-        shared_ldflag    => add("-shared -static-libgcc"),
+        shared_ldflag    => add_before("-shared -static-libgcc"),
     },
     "solaris64-x86_64-gcc" => {
         # -shared -static-libgcc might appear controversial, but modules
@@ -254,7 +254,7 @@ my %targets = (
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-fPIC",
-        shared_ldflag    => add("-shared -static-libgcc"),
+        shared_ldflag    => add_before("-shared -static-libgcc"),
         multilib         => "/64",
     },
 
@@ -285,7 +285,7 @@ my %targets = (
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-KPIC",
-        shared_ldflag    => add("-G -dy -z text"),
+        shared_ldflag    => add_before("-G -dy -z text"),
         multilib         => "/64",
     },
 
@@ -301,7 +301,7 @@ my %targets = (
         ex_libs          => add(threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-fPIC",
-        shared_ldflag    => add("-shared"),
+        shared_ldflag    => add_before("-shared"),
     },
     "solaris-sparcv8-gcc" => {
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
@@ -336,7 +336,7 @@ my %targets = (
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
-        shared_ldflag    => add("-G -dy -z text"),
+        shared_ldflag    => add_before("-G -dy -z text"),
     },
 ####
     "solaris-sparcv8-cc" => {
@@ -356,75 +356,60 @@ my %targets = (
 
 #### IRIX 6.x configs
 # Only N32 and N64 ABIs are supported.
+    "irix-common" => {
+        inherit_from     => [ "BASE_unix" ],
+        template         => 1,
+        cppflags         => threads("-D_SGI_MP_SOURCE"),
+        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",
+        ex_libs          => add(threads("-lpthread")),
+        thread_scheme    => "pthreads",
+        dso_scheme       => "dlfcn",
+        shared_target    => "self",
+        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
+        shared_ldflag    => "-shared -Wl,-Bsymbolic",
+        shared_sonameflag=> "-Wl,-soname,",
+    },
     "irix-mips3-gcc" => {
-        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
+        inherit_from     => [ "irix-common", asm("mips64_asm") ],
         CC               => "gcc",
         CFLAGS           => picker(debug   => "-g -O0",
                                    release => "-O3"),
+        LDFLAGS          => "-static-libgcc",
         cflags           => "-mabi=n32",
-        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",
-                                    threads("-D_SGI_MP_SOURCE")),
-        cppflags         => threads("-D_SGI_MP_SOURCE"),
-        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",
-        ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
-        thread_scheme    => "pthreads",
         perlasm_scheme   => "n32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "irix-shared",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
         multilib         => "32",
     },
     "irix-mips3-cc" => {
-        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
+        inherit_from     => [ "irix-common", asm("mips64_asm") ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "-g -O0",
                                    release => "-O2"),
         cflags           => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared",
-        cppflags         => threads("-D_SGI_MP_SOURCE"),
-        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",
-        ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
-        thread_scheme    => "pthreads",
         perlasm_scheme   => "n32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "irix-shared",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
         multilib         => "32",
     },
     # N64 ABI builds.
     "irix64-mips4-gcc" => {
-        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
+        inherit_from     => [ "irix-common", asm("mips64_asm") ],
         CC               => "gcc",
         CFLAGS           => picker(debug   => "-g -O0",
                                    release => "-O3"),
+        LDFLAGS          => "-static-libgcc",
         cflags           => "-mabi=64 -mips4",
-        cppflags         => threads("-D_SGI_MP_SOURCE"),
-        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",
-        ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
-        thread_scheme    => "pthreads",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "irix-shared",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
         multilib         => "64",
     },
     "irix64-mips4-cc" => {
-        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
+        inherit_from     => [ "irix-common", asm("mips64_asm") ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "-g -O0",
                                    release => "-O2"),
         cflags           => "-64 -mips4 -use_readonly_const -G0 -rdata_shared",
-        cppflags         => threads("-D_SGI_MP_SOURCE"),
-        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",
-        ex_libs          => threads("-lpthread"),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
-        thread_scheme    => "pthreads",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "irix-shared",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
         multilib         => "64",
     },
 
@@ -1125,14 +1110,17 @@ my %targets = (
         template         => 1,
         sys_id           => "AIX",
         lib_cppflags     => "-DB_ENDIAN",
+        lflags           => "-Wl,-bsvr4",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "self",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-        bin_lflags       => shared("-Wl,-bsvr4"),
-        module_ldflags   => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath",
-        shared_ldflag    => "-Wl,-G,-bsymbolic,-bnolibpath",
+        module_ldflags   => "-Wl,-G,-bsymbolic,-bexpall",
+        shared_ldflag    => "-Wl,-G,-bsymbolic",
         shared_defflag   => "-Wl,-bE:",
+        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
+        dso_extension    => ".so",
+        lib_extension    => shared("_a.a"),
+        shared_extension_simple => shared(".a"),
     },
     "aix-gcc" => {
         inherit_from     => [ "aix-common", asm("ppc32_asm") ],
@@ -1143,7 +1131,7 @@ my %targets = (
         ex_libs          => threads("-pthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         perlasm_scheme   => "aix32",
-        shared_ldflag    => add("-shared -static-libgcc"),
+        shared_ldflag    => add_before("-shared -static-libgcc"),
         AR               => add("-X32"),
         RANLIB           => add("-X32"),
     },
@@ -1156,7 +1144,8 @@ my %targets = (
         ex_libs          => threads("-pthread"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "aix64",
-        shared_ldflag    => add("-shared -static-libgcc"),
+        shared_ldflag    => add_before("-shared -static-libgcc"),
+        shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)",
         AR               => add("-X64"),
         RANLIB           => add("-X64"),
     },
@@ -1188,6 +1177,7 @@ my %targets = (
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_cflag     => "-qpic",
+        shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)",
         AR               => add("-X64"),
         RANLIB           => add("-X64"),
     },
Unnamed repository; edit this file 'description' to name the repository.