- up to final 1.1.1

[packages/openssl.git] / openssl-optflags.patch

diff --git a/openssl-optflags.patch b/openssl-optflags.patch
index a9477f92f83d471eb38016c75cdf9d8588218d63..b80afc89ee9908fb90cbeab12890b4d794d8190f 100644 (file)
--- a/openssl-optflags.patch
+++ b/openssl-optflags.patch
@@ -1,11 +1,11 @@
---- openssl-1.1.0g/Configurations/unix-Makefile.tmpl.orig      2017-11-19 17:44:59.020806300 +0100
-+++ openssl-1.1.0g/Configurations/unix-Makefile.tmpl   2017-11-19 17:50:26.124135897 +0100
-@@ -174,7 +174,7 @@
- 
- CROSS_COMPILE= {- $config{cross_compile_prefix} -}
- CC= $(CROSS_COMPILE){- $target{cc} -}
--CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -}
-+CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} $(OPTFLAGS)
- CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}
- LDFLAGS= {- $target{lflags} -}
- PLIB_LDFLAGS= {- $target{plib_lflags} -}
+--- openssl-1.1.1/Configurations/unix-Makefile.tmpl~   2018-09-13 13:08:19.000000000 +0200
++++ openssl-1.1.1/Configurations/unix-Makefile.tmpl    2018-09-13 13:15:24.200834530 +0200
+@@ -205,7 +205,7 @@ CPPFLAGS={- our $cppflags1 = join(" ",
+                                   (map { "-D".$_} @{$config{CPPDEFINES}}),
+                                   (map { "-I".$_} @{$config{CPPINCLUDES}}),
+                                   @{$config{CPPFLAGS}}) -}
+-CFLAGS={- join(' ', @{$config{CFLAGS}}) -}
++CFLAGS={- join(' ', @{$config{CFLAGS}}) -} $(OPTFLAGS)
+ CXXFLAGS={- join(' ', @{$config{CXXFLAGS}}) -}
+ LDFLAGS= {- join(' ', @{$config{LDFLAGS}}) -}
+ EX_LIBS= {- join(' ', @{$config{LDLIBS}}) -}