2009-08-29 20:22:06 +00:00
|
|
|
diff -up openssl-1.0.0-beta3/Makefile.org.mingw-libversion openssl-1.0.0-beta3/Makefile.org
|
|
|
|
|
--- openssl-1.0.0-beta3/Makefile.org.mingw-libversion 2009-08-29 22:44:10.000000000 +0300
|
|
|
|
|
+++ openssl-1.0.0-beta3/Makefile.org 2009-08-29 22:45:42.000000000 +0300
|
|
|
|
|
@@ -542,8 +542,8 @@ install_sw:
|
|
|
|
|
fi ); \
|
|
|
|
|
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
|
|
|
|
|
( case $$i in \
|
|
|
|
|
- *crypto*) i=libeay32.dll;; \
|
|
|
|
|
- *ssl*) i=ssleay32.dll;; \
|
|
|
|
|
+ *crypto*) i=libcrypto-$(SHLIB_SONAMEVER).dll;; \
|
|
|
|
|
+ *ssl*) i=libssl-$(SHLIB_SONAMEVER).dll;; \
|
|
|
|
|
esac; \
|
|
|
|
|
echo installing $$i; \
|
|
|
|
|
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
|
|
|
|
|
diff -up openssl-1.0.0-beta3/Makefile.shared.mingw-libversion openssl-1.0.0-beta3/Makefile.shared
|
|
|
|
|
--- openssl-1.0.0-beta3/Makefile.shared.mingw-libversion 2009-08-29 22:33:22.000000000 +0300
|
|
|
|
|
+++ openssl-1.0.0-beta3/Makefile.shared 2009-08-29 22:33:22.000000000 +0300
|
|
|
|
|
@@ -47,7 +47,7 @@ LIBEXTRAS=
|
|
|
|
|
# LIBVERSION contains the current version of the library.
|
|
|
|
|
# For example, to build libfoo.so.1.2, you need to do the following:
|
|
|
|
|
#LIBVERSION=1.2
|
|
|
|
|
-LIBVERSION=
|
|
|
|
|
+LIBVERSION=10
|
|
|
|
|
|
|
|
|
|
# LIBCOMPATVERSIONS contains the compatibility versions (a list) of
|
|
|
|
|
# the library. They MUST be in decreasing order.
|
|
|
|
|
@@ -250,9 +250,9 @@ link_o.cygwin:
|
|
|
|
|
base=-Wl,--enable-auto-image-base; \
|
|
|
|
|
deffile=; \
|
|
|
|
|
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
|
|
|
|
|
- SHLIB=$(LIBNAME)eay32; base=; \
|
|
|
|
|
- if test -f $(LIBNAME)eay32.def; then \
|
|
|
|
|
- deffile=$(LIBNAME)eay32.def; \
|
|
|
|
|
+ SHLIB=lib$(LIBNAME); base=; \
|
|
|
|
|
+ if test -f $(LIBNAME).def; then \
|
|
|
|
|
+ deffile=$(LIBNAME).def; \
|
|
|
|
|
fi; \
|
|
|
|
|
fi; \
|
|
|
|
|
SHLIB_SUFFIX=.dll; \
|
|
|
|
|
@@ -270,13 +270,9 @@ link_a.cygwin:
|
|
|
|
|
dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
|
|
|
|
|
base=-Wl,--enable-auto-image-base; \
|
|
|
|
|
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
|
|
|
|
|
- case $(LIBNAME) in \
|
|
|
|
|
- crypto) SHLIB=libeay;; \
|
|
|
|
|
- ssl) SHLIB=ssleay;; \
|
|
|
|
|
- esac; \
|
|
|
|
|
- SHLIB_SOVER=32; \
|
|
|
|
|
+ SHLIB=lib$(LIBNAME); \
|
|
|
|
|
extras="$(LIBNAME).def"; \
|
|
|
|
|
- $(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
|
|
|
|
|
+ $(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \
|
|
|
|
|
base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
|
|
|
|
|
fi; \
|
|
|
|
|
dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
|
2009-08-29 23:13:34 +00:00
|
|
|
--- openssl-1.0.0-beta3/util/mkdef.pl.orig 2009-08-30 00:50:32.108820466 +0200
|
|
|
|
|
+++ openssl-1.0.0-beta3/util/mkdef.pl 2009-08-30 00:51:00.032820656 +0200
|
|
|
|
|
@@ -1244,7 +1244,7 @@
|
|
|
|
|
my $description = "$what $version, $name - http://$http_vendor";
|
|
|
|
|
|
|
|
|
|
if ($W32)
|
|
|
|
|
- { $libname.="32"; }
|
|
|
|
|
+ { $libname="lib$libname-10.dll"; }
|
|
|
|
|
elsif ($W16)
|
|
|
|
|
{ $libname.="16"; }
|
|
|
|
|
elsif ($OS2)
|
