[mingw-openssl: 21/32] Properly regenerate def files with mkdef.pl and drop linker-fix.patch

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 20:08:00 UTC 2012


commit e550fc601adcffc3a0c28e1710c2c3e7e6e00a9f
Author: Kalev Lember <kalev at fedoraproject.org>
Date:   Sat Jun 19 20:08:08 2010 +0000

    Properly regenerate def files with mkdef.pl and drop linker-fix.patch

 mingw32-openssl-1.0.0a-linker-fix.patch |   45 -------------------------------
 mingw32-openssl.spec                    |    9 +++---
 2 files changed, 5 insertions(+), 49 deletions(-)
---
diff --git a/mingw32-openssl.spec b/mingw32-openssl.spec
index 9711b92..139f6bf 100644
--- a/mingw32-openssl.spec
+++ b/mingw32-openssl.spec
@@ -85,9 +85,6 @@ Patch53:        openssl-1.0.0-name-hash.patch
 Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
 Patch102:       mingw32-openssl-1.0.0a-sfx.patch
-# Ugly patch to fix a compilation error (the linker can't find
-# some symbols mentioned in an autogenerated .def file)
-Patch103:       mingw32-openssl-1.0.0a-linker-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -181,7 +178,6 @@ Static version of the MinGW port of the OpenSSL toolkit.
 
 %patch101 -p1 -b .mingw-libversion
 %patch102 -p1 -b .mingw-sfx
-%patch103 -p1 -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
@@ -207,6 +203,10 @@ make TABLE PERL=%{__perl}
   shared mingw
 #  --with-krb5-flavor=MIT
 #  -I%{_mingw32_prefix}/kerberos/include -L%{_mingw32_prefix}/kerberos/%{_lib}
+
+# Regenerate def files as we disabled some algorithms above
+perl util/mkdef.pl crypto ssl update
+
 make depend
 make all build-shared
 
@@ -349,6 +349,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use sed to fix up cflags instead of unmaintainable patch
 - Rebased mingw32 specific patches
 - Disabled capieng to fix build
+- Properly regenerate def files with mkdef.pl and drop linker-fix.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