projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix recent typo. -DL_ENDIAN / -DB_ENDIAN, not -DL_DEBIAN / -DB_DEBIAN
[openssl.git] / Configurations / 10-main.conf
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9a27dc9065bd86310afc851a5154a7a741eb820e..62fbb60f1ef122d1f8393085cc4266b0163e25c3 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -148,6 +148,7 @@ my %targets = (
 
 #### Basic configs that should work on any 32-bit box
     "gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
         cflags           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
@@ -155,6 +156,7 @@ my %targets = (
         bn_ops           => "BN_LLONG",
     },
     "cc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-O",
         thread_scheme    => "(unknown)",
@@ -197,7 +199,7 @@ my %targets = (
                                               debug   => "-O0 -g",
                                               release => "-O3 -fomit-frame-pointer"),
                                        threads("-pthread")),
-        cppflags         => add("-DL_DEBIAN"),
+        cppflags         => add("-DL_ENDIAN"),
         ex_libs          => add(threads("-pthread")),
         bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
@@ -218,7 +220,7 @@ my %targets = (
                                               debug   => "-O0 -g",
                                               release => "-O3"),
                                        threads("-pthread")),
-        cppflags         => add("-DL_DEBIAN"),
+        cppflags         => add("-DL_ENDIAN"),
         ex_libs          => add(threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
@@ -246,7 +248,7 @@ my %targets = (
         cflags           => add_before(picker(default => "-xarch=generic64 -xstrconst -Xa",
                                               debug   => "-g",
                                               release => "-xO5 -xdepend -xbuiltin")),
-        cppflags         => add("-DL_DEBIAN", threads("-D_REENTRANT")),
+        cppflags         => add("-DL_ENDIAN", threads("-D_REENTRANT")),
         thread_scheme    => "pthreads",
         lflags           => add(threads("-mt")),
         ex_libs          => add(threads("-lpthread")),
@@ -265,7 +267,7 @@ my %targets = (
                                               debug   => "-O0 -g",
                                               release => "-O3"),
                                        threads("-pthread")),
-        cppflags         => add("-DB_DEBIAN -DBN_DIV2W"),
+        cppflags         => add("-DB_ENDIAN -DBN_DIV2W"),
         ex_libs          => add(threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-fPIC",
@@ -298,7 +300,7 @@ my %targets = (
         cflags           => add_before(picker(default => "-xstrconst -Xa",
                                               debug   => "-g",
                                               release => "-xO5 -xdepend")),
-        cppflags         => add("-DB_DEBIAN -DBN_DIV2W",
+        cppflags         => add("-DB_ENDIAN -DBN_DIV2W",
                                 threads("-D_REENTRANT")),
         lflags           => add(threads("-mt")),
         ex_libs          => add(threads("-lpthread")),
@@ -330,7 +332,7 @@ my %targets = (
         cflags           => combine(picker(default => "-mabi=n32",
                                            debug   => "-g -O0",
                                            release => "-O3")),
-        cppflags         => combine("-DB_DEBIAN -DBN_DIV3W",
+        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",
                                     threads("-D_SGI_MP_SOURCE")),
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
@@ -347,7 +349,7 @@ my %targets = (
         cflags           => combine(picker(default => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared",
                                            debug   => "-g -O0",
                                            release => "-O2")),
-        cppflags         => combine("-DB_DEBIAN -DBN_DIV3W",
+        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",
                                     threads("-D_SGI_MP_SOURCE")),
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
@@ -365,7 +367,7 @@ my %targets = (
         cflags           => combine(picker(default => "-mabi=64 -mips4",
                                            debug   => "-g -O0",
                                            release => "-O3")),
-        cppflags         => combine("-DB_DEBIAN -DBN_DIV3W",
+        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",
                                     threads("-D_SGI_MP_SOURCE")),
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
@@ -382,7 +384,7 @@ my %targets = (
         cflags           => combine(picker(default => "-64 -mips4 -use_readonly_const -G0 -rdata_shared",
                                            debug   => "-g -O0",
                                            release => "-O2")),
-        cppflags         => combine("-DB_DEBIAN -DBN_DIV3W",
+        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",
                                     threads("-D_SGI_MP_SOURCE")),
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
@@ -427,7 +429,7 @@ my %targets = (
         cflags           => combine(picker(debug   => "-O0 -g",
                                            release => "-O3"),
                                     threads("-pthread")),
-        cppflags         => "-DB_DEBIAN -DBN_DIV2W",
+        cppflags         => "-DB_ENDIAN -DBN_DIV2W",
         ex_libs          => add("-Wl,+s -ldld", threads("-pthread")),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
@@ -446,7 +448,7 @@ my %targets = (
         cc               => "gcc",
         cflags           => combine(picker(debug   => "-O0 -g",
                                            release => "-O3")),
-        cppflags         => combine("-DB_DEBIAN", threads("-D_REENTRANT")),
+        cppflags         => combine("-DB_ENDIAN", threads("-D_REENTRANT")),
         ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         thread_scheme    => "pthreads",
@@ -465,7 +467,7 @@ my %targets = (
         cflags           => combine(picker(default => "+Optrs_strongly_typed -Ae +ESlit",
                                            debug   => "+O0 +d -g",
                                            release => "+O3")),
-        cppflags         => combine("-DB_DEBIAN -DBN_DIV2W -DMD32_XARRAY",
+        cppflags         => combine("-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
                                     threads("-D_REENTRANT")),
         ex_libs          => add("-Wl,+s -ldld",threads("-lpthread")),
         bn_ops           => "RC4_CHAR",
@@ -487,7 +489,7 @@ my %targets = (
         cflags           => combine(picker(default => "+DD64 +Optrs_strongly_typed -Ae +ESlit",
                                            debug   => "+O0 +d -g",
                                            release => "+O3")),
-        cppflags         => combine("-DB_DEBIAN -DMD32_XARRAY",
+        cppflags         => combine("-DB_ENDIAN -DMD32_XARRAY",
                                     threads("-D_REENTRANT")),
         ex_libs          => add("-ldl",threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
@@ -507,7 +509,7 @@ my %targets = (
         cflags           => combine(picker(default => "-Ae +DD32 +Olit=all -z",
                                            debug   => "+O0 +d -g",
                                            release => "+O2")),
-        cppflags         => combine("-DB_DEBIAN", threads("-D_REENTRANT")),
+        cppflags         => combine("-DB_ENDIAN", threads("-D_REENTRANT")),
         ex_libs          => add("-ldl",threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT",
         thread_scheme    => "pthreads",
@@ -524,7 +526,7 @@ my %targets = (
         cflags           => combine(picker(default => "-Ae +DD64 +Olit=all -z",
                                            debug   => "+O0 +d -g",
                                            release => "+O3")),
-        cppflags         => combine("-DB_DEBIAN", threads("-D_REENTRANT")),
+        cppflags         => combine("-DB_ENDIAN", threads("-D_REENTRANT")),
         ex_libs          => add("-ldl", threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         thread_scheme    => "pthreads",
@@ -542,7 +544,7 @@ my %targets = (
         cflags           => combine(picker(debug   => "-O0 -g",
                                            release => "-O3"),
                                     threads("-pthread")),
-        cppflags         => "-DB_DEBIAN",
+        cppflags         => "-DB_ENDIAN",
         ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT",
         thread_scheme    => "pthreads",
@@ -560,7 +562,7 @@ my %targets = (
                                            debug   => "-O0 -g",
                                            release => "-O3"),
                                     threads("-pthread")),
-        cppflags         => "-DB_DEBIAN",
+        cppflags         => "-DB_ENDIAN",
         ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         thread_scheme    => "pthreads",
@@ -630,6 +632,10 @@ my %targets = (
                                            debug   => "-O0 -g",
                                            release => "-O3"),
                                     threads("-pthread")),
+        cxxflags         => combine(picker(default => "-std=c++11 -Wall",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
         cppflags         => "-DOPENSSL_USE_NODELETE",
         ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
@@ -1408,7 +1414,7 @@ my %targets = (
             # WIN32 UNICODE build gets linked with unicows.lib for
             # backward compatibility with Win9x.
             push @ex_libs, 'unicows.lib'
-                if (grep { $_ eq "UNICODE" } @user_defines);
+                if (grep { $_ eq "UNICODE" } @{$user{CPPDEFINES}});
             return join(" ", @ex_libs, @_);
         }),
         sys_id           => "WIN32",
@@ -1431,7 +1437,7 @@ my %targets = (
                                      : " /MC"; }),
                    debug   => "/Od",
                    release => "/O1i"),
-        cppflags         => sub { vc_wince_info()->{defines}; },
+        cppflags         => sub { vc_wince_info()->{cppflags}; },
         defines          =>
             picker(default => [ "UNICODE", "_UNICODE", "OPENSSL_SYS_WINCE",
                                 "WIN32_LEAN_AND_MEAN", "L_ENDIAN", "DSO_WIN32",
Unnamed repository; edit this file 'description' to name the repository.