[packages/openssl102: 230/432] - rel 3; more gcc 4.2 hacks until issue properly resolved

adwol adwol at pld-linux.org
Sat Sep 29 01:20:55 CEST 2018


commit cdfa969501145b8968305d03e12b3961205a0c63
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 24 23:34:21 2007 +0000

    - rel 3; more gcc 4.2 hacks until issue properly resolved
    
    Changed files:
        openssl.spec -> 1.170

 openssl.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 33a279f..e279e34 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,4 +1,6 @@
-#
+# TODO:
+# - get rid of gcc_4_2 patch and header files crapolla
+
 # Conditional build:
 %bcond_without	tests
 %bcond_with purify	# Compile openssl with \-DPURIFY, useful when one wants to
@@ -15,7 +17,7 @@ Summary(ru.UTF-8):	Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
 Version:	0.9.8e
-Release:	2
+Release:	3
 License:	Apache-style License
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -194,6 +196,10 @@ бібліотеки для розробки програм з використ
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+# XXX: gcc 4.2 hack
+cp crypto/asn1/asn1.h crypto/asn1/asn1.h.X
+cp crypto/ocsp/ocsp.h crypto/ocsp/ocsp.h.X
+cp crypto/pem/pem.h crypto/pem/pem.h.X
 %patch6 -p1
 
 %build
@@ -344,6 +350,11 @@ echo ".so openssl_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/config.5
 rm $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
 echo ".so openssl_des_modes.7" > $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
 
+# XXX: gcc 4.2 hack
+install crypto/asn1/asn1.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/asn1.h
+install crypto/ocsp/ocsp.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/ocsp.h
+install crypto/pem/pem.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/pem.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list