openssl/opensslmingw.patch

   1 --- misc/openssl-0.9.8k/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
   2 +++ misc/build/openssl-0.9.8k/Makefile.shared   2009-03-30 11:52:53.684538000 +0200
   3 @@ -238,14 +238,19 @@
   4         SHLIB=cyg$(LIBNAME); \
   5         base=-Wl,--enable-auto-image-base; \
   6         if expr $(PLATFORM) : 'mingw' > /dev/null; then \
   7 -               SHLIB=$(LIBNAME)eay32; base=; \
   8 +               SHLIB=$(LIBNAME)eay32; \
   9 +               base=;  \
  10 +        if test $(LIBNAME) = "crypto"; then \
  11 +           SHLIB=libeay32; \
  12 +           base=-Wl,--image-base,0x63000000; \
  13 +        fi; \
  14         fi; \
  15         SHLIB_SUFFIX=.dll; \
  16         LIBVERSION="$(LIBVERSION)"; \
  17 -       SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
  18 +       SHLIB_SOVER=\
  19         ALLSYMSFLAGS='-Wl,--whole-archive'; \
  20         NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
  21 -       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
  22 +       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
  23         $(LINK_SO_O)
  24  link_a.cygwin:
  25         @ $(CALC_VERSIONS); \
  26 --- misc/openssl-0.9.8k/ms/mingw32.bat  2006-05-05 15:19:32.000000000 +0200
  27 +++ misc/build/openssl-0.9.8k/ms/mingw32.bat    2009-03-30 11:54:10.000000000 +0200
  28 @@ -79,13 +79,19 @@
  29  rem copy ms\tlhelp32.h outinc
  30
  31  echo Building the libraries
  32 -mingw32-make -f ms/mingw32a.mak
  33 +make -f ms/mingw32a.mak
  34  if errorlevel 1 goto end
  35
  36  echo Generating the DLLs and input libraries
  37 -dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
  38 +mv out/libcrypto.a out/libcrypto_static.a
  39 +mv out/libssl.a out/libssl_static.a
  40 +dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
  41  if errorlevel 1 goto end
  42 -dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
  43 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
  44 +if errorlevel 1 goto end
  45 +dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
  46 +if errorlevel 1 goto end
  47 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
  48  if errorlevel 1 goto end
  49
  50  echo Done compiling OpenSSL
  51 --- misc/openssl-0.9.8k/util/pl/Mingw32.pl      2006-05-05 15:19:34.000000000 +0200
  52 +++ misc/build/openssl-0.9.8k/util/pl/Mingw32.pl        2009-03-30 11:55:04.000000000 +0200
  53 @@ -6,11 +6,11 @@
  54  $o='/';
  55  $cp='cp';
  56  $rm='rm -f';
  57 -$mkdir='gmkdir';
  58 +#$mkdir='gmkdir';
  59
  60 -$o='\\';
  61 -$cp='copy';
  62 -$rm='del';
  63 +#$o='\\';
  64 +#$cp='copy';
  65 +#$rm='del';
  66  $mkdir='mkdir';
  67
  68  # C compiler stuff
  69 @@ -87,7 +87,8 @@
  70         ($Name=$name) =~ tr/a-z/A-Z/;
  71
  72         $ret.="$target: \$(${Name}OBJ)\n";
  73 -       $ret.="\tif exist $target \$(RM) $target\n";
  74 +    $ret.="\t\$(RM) $target\n";
  75 +#      $ret.="\tif exist $target \$(RM) $target\n";
  76         $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
  77         $ret.="\t\$(RANLIB) $target\n\n";
  78         }