diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch index 39d4328184..35d92bedb7 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch | |||
@@ -1,12 +1,12 @@ | |||
1 | Upstream-Status: Backport [debian] | 1 | Upstream-Status: Backport [debian] |
2 | 2 | ||
3 | Index: openssl-1.0.2/Configure | 3 | Index: openssl-1.0.2n/Configure |
4 | =================================================================== | 4 | =================================================================== |
5 | --- openssl-1.0.2.orig/Configure | 5 | --- openssl-1.0.2n.orig/Configure |
6 | +++ openssl-1.0.2/Configure | 6 | +++ openssl-1.0.2n/Configure |
7 | @@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic | 7 | @@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa |
8 | 8 | # Warn that "make depend" should be run? | |
9 | my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum"; | 9 | my $warn_make_depend = 0; |
10 | 10 | ||
11 | +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS | 11 | +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS |
12 | +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; | 12 | +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; |
@@ -15,7 +15,7 @@ Index: openssl-1.0.2/Configure | |||
15 | my $strict_warnings = 0; | 15 | my $strict_warnings = 0; |
16 | 16 | ||
17 | my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; | 17 | my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; |
18 | @@ -343,6 +347,55 @@ my %table=( | 18 | @@ -369,6 +373,55 @@ my %table=( |
19 | "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", | 19 | "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", |
20 | "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", | 20 | "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", |
21 | 21 | ||