[packages/openssl102: 357/432] fix gcc -E not dumping output with .s ext, works with .S

[adwol]

commit 7b2311a53ca37b78d01e627238baed00bdb2f884
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 1 23:02:56 2015 +0200

    fix gcc -E not dumping output with .s ext, works with .S

 gcc-E-asm.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 openssl.spec    |  5 +++--
 2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 39e6135..bd1f694 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -37,11 +37,11 @@ Patch5:		%{name}-asflag.patch
 Patch6:		%{name}-ca-certificates.patch
 Patch7:		%{name}-ldflags.patch
 Patch8:		%{name}-find.patch
-# from debian
+Patch9:		gcc-E-asm.patch
 Patch10:	default_bits.patch
 Patch11:	pic.patch
 Patch12:	stddef.patch
-Patch13:	openssl_fix_for_x32.patch
+Patch13:	%{name}_fix_for_x32.patch
 URL:		http://www.openssl.org/
 BuildRequires:	bc
 BuildRequires:	perl-devel >= 1:5.6.1
@@ -259,6 +259,7 @@ бібліотеки для розробки програм з використ
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
diff --git a/gcc-E-asm.patch b/gcc-E-asm.patch
new file mode 100644
index 0000000..3242725
--- /dev/null
+++ b/gcc-E-asm.patch
@@ -0,0 +1,46 @@
+gcc -E does nothing for .s, need .S for preprocess to output
+
+--- openssl-1.0.1j/crypto/Makefile~	2015-01-01 23:00:33.000000000 +0200
++++ openssl-1.0.1j/crypto/Makefile	2015-01-01 23:00:35.000000000 +0200
+@@ -79,7 +79,7 @@
+ ppccpuid.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
+ pariscid.s:	pariscid.pl;	$(PERL) pariscid.pl $(PERLASM_SCHEME) $@
+ alphacpuid.s:	alphacpuid.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
++	(preproc=/tmp/$$$$.$@.S; trap "rm $$preproc" INT; \
+ 	$(PERL) alphacpuid.pl > $$preproc && \
+ 	$(CC) -E $$preproc > $@ && rm $$preproc)
+ 
+--- openssl-1.0.1j/crypto/modes/Makefile~	2014-10-15 15:54:35.000000000 +0300
++++ openssl-1.0.1j/crypto/modes/Makefile	2015-01-01 23:17:28.000000000 +0200
+@@ -53,7 +53,7 @@
+ ghash-sparcv9.s:	asm/ghash-sparcv9.pl
+ 	$(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
+ ghash-alpha.s:	asm/ghash-alpha.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
++	(preproc=/tmp/$$$$.$@.S; trap "rm $$preproc" INT; \
+ 	$(PERL) asm/ghash-alpha.pl > $$preproc && \
+ 	$(CC) -E $$preproc > $@ && rm $$preproc)
+ 
+--- openssl-1.0.1j/crypto/sha/Makefile~	2014-10-15 15:54:34.000000000 +0300
++++ openssl-1.0.1j/crypto/sha/Makefile	2015-01-01 23:19:33.000000000 +0200
+@@ -60,7 +60,7 @@
+ 	$(PERL) $< $(PERLASM_SCHEME) $@
+ 
+ sha1-alpha.s:	asm/sha1-alpha.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
++	(preproc=/tmp/$$$$.$@.S; trap "rm $$preproc" INT; \
+ 	$(PERL) asm/sha1-alpha.pl > $$preproc && \
+ 	$(CC) -E $$preproc > $@ && rm $$preproc)
+ 
+--- openssl-1.0.1j/crypto/bn/Makefile~	2015-01-01 23:21:25.000000000 +0200
++++ openssl-1.0.1j/crypto/bn/Makefile	2015-01-01 23:21:28.000000000 +0200
+@@ -125,7 +125,7 @@
+ ppc64-mont.s:	asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
+ 
+ alpha-mont.s:	asm/alpha-mont.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
++	(preproc=/tmp/$$$$.$@.S; trap "rm $$preproc" INT; \
+ 	$(PERL) asm/alpha-mont.pl > $$preproc && \
+ 	$(CC) -E $$preproc > $@ && rm $$preproc)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e