[mingw-openssl: 18/32] Use sed to fix up cflags instead of unmaintainable patch
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 20:07:45 UTC 2012
commit f943b6e544a0be7f6a6f3b1cf2896c4191659a73
Author: Kalev Lember <kalev at fedoraproject.org>
Date: Sat Jun 19 19:46:13 2010 +0000
Use sed to fix up cflags instead of unmaintainable patch
mingw32-openssl-1.0.0-beta3-configure.patch | 12 ------------
mingw32-openssl.spec | 8 ++++----
2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/mingw32-openssl.spec b/mingw32-openssl.spec
index 79cc7af..77e2fa3 100644
--- a/mingw32-openssl.spec
+++ b/mingw32-openssl.spec
@@ -81,8 +81,6 @@ Patch53: openssl-1.0.0-name-hash.patch
# Backported fixes including security fixes
# MinGW-specific patches.
-# Use MINGW32_CFLAGS (set below) in Configure script
-Patch100: mingw32-openssl-1.0.0-beta3-configure.patch
# Rename *eay32.dll to lib*.dll
Patch101: mingw32-openssl-1.0.0-beta3-libversion.patch
# Fix engines/ install target after lib rename
@@ -181,11 +179,13 @@ Static version of the MinGW port of the OpenSSL toolkit.
%patch52 -p1 -b .aesni
%patch53 -p1 -b .name-hash
-%patch100 -p1 -b .mingw-configure
%patch101 -p1 -b .mingw-libversion
%patch102 -p1 -b .mingw-sfx
%patch105 -p0 -b .mingw-linker-fix
+# Use _mingw32_cflags instead of hardcoded ones
+sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/%{_mingw32_cflags}/' Configure
+
# Modify the various perl scripts to reference perl in the right location.
perl util/perlpath.pl `dirname %{__perl}`
@@ -196,7 +196,6 @@ make TABLE PERL=%{__perl}
%build
# NB: 'no-hw' is vital. MinGW cannot build the hardware drivers
# and if you don't have this you'll get an obscure link error.
-export MINGW32_CFLAGS="%{_mingw32_cflags}"; \
./Configure \
--prefix=%{_mingw32_prefix} \
--openssldir=%{_mingw32_sysconfdir}/pki/tls \
@@ -346,6 +345,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Jun 19 2010 Kalev Lember <kalev at smartlink.ee> - 1.0.0a-1
- Updated to openssl 1.0.0a
- Synced patches with Fedora native openssl-1.0.0a-1
+- Use sed to fix up cflags instead of unmaintainable patch
* Thu Nov 26 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.6.beta4
- Merged patches from native Fedora openssl (up to 1.0.0-0.16.beta4)
More information about the scm-commits
mailing list