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 @@ -254,13 +254,17 @@
   4         base=-Wl,--enable-auto-image-base; \
   5         if expr $(PLATFORM) : 'mingw' > /dev/null; then \
   6                 SHLIB=$(LIBNAME)eay32; \
   7 -               base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
   8 +               base=;  \
   9 +                if test $(LIBNAME) = "crypto"; then \
  10 +                        SHLIB=libeay32; \
  11 +                        base=-Wl,--image-base,0x63000000; \
  12 +                fi; \
  13         fi; \
  14         SHLIB_SUFFIX=.dll; \
  15 -       SHLIB_SOVER=-$(LIBVERSION); \
  16 +       SHLIB_SOVER=; \
  17         ALLSYMSFLAGS='-Wl,--whole-archive'; \
  18         NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
  19 -       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
  20 +       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
  21         [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
  22         [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
  23         $(LINK_SO_A) || exit 1; \
  24 --- misc/openssl-0.9.8k/apps/Makefile   2008-11-20 01:03:48.000000000 +0900
  25 +++ misc/build/openssl-0.9.8k/apps/Makefile     2009-04-10 19:49:37.006875000 +0900
  26 @@ -153,12 +153,12 @@
  27         shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
  28                 shlib_target="$(SHLIB_TARGET)"; \
  29         elif [ -n "$(FIPSCANLIB)" ]; then \
  30 -         FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
  31 +         FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
  32         fi; \
  33         LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
  34         [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
  35         $(MAKE) -f $(TOP)/Makefile.shared -e \
  36 -               CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
  37 +               CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
  38                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
  39                 link_app.$${shlib_target}
  40         -(cd ..; \
  41 --- misc/openssl-0.9.8k/e_os2.h 2005-12-19 03:57:07.000000000 +0900
  42 +++ misc/build/openssl-0.9.8k/e_os2.h   2009-04-04 23:07:15.324250000 +0900
  43 @@ -264,7 +264,7 @@
  44  # define OPENSSL_IMPLEMENT_GLOBAL(type,name)                        \
  45         extern type _hide_##name;                                    \
  46         type *_shadow_##name(void) { return &_hide_##name; }         \
  47 -       static type _hide_##name
  48 +       type _hide_##name
  49  # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
  50  # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
  51  #else
  52 --- misc/openssl-0.9.8k/ms/mingw32.bat  2006-05-05 15:19:32.000000000 +0200
  53 +++ misc/build/openssl-0.9.8k/ms/mingw32.bat    2009-03-30 11:54:10.000000000 +0200
  54 @@ -79,15 +79,41 @@
  55  rem copy ms\tlhelp32.h outinc
  56
  57  echo Building the libraries
  58 -mingw32-make -f ms/mingw32a.mak
  59 +make -f ms/mingw32a.mak
  60  if errorlevel 1 goto end
  61
  62  echo Generating the DLLs and input libraries
  63 -dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
  64 +mv out/libcrypto.a out/libcrypto_static.a
  65 +mv out/libssl.a out/libssl_static.a
  66 +dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
  67  if errorlevel 1 goto end
  68 -dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
  69 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
  70  if errorlevel 1 goto end
  71 +dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
  72 +if errorlevel 1 goto end
  73 +if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib
  74 +if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib
  75 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
  76 +if errorlevel 1 goto end
  77 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
  78 +if errorlevel 1 goto end
  79 +goto finished
  80 +
  81 +:shared_gcclib
  82 +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
  83 +if errorlevel 1 goto end
  84 +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
  85 +if errorlevel 1 goto end
  86 +goto finished
  87 +
  88 +:shared_gxxlib
  89 +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s
  90 +if errorlevel 1 goto end
  91 +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s
  92 +if errorlevel 1 goto end
  93 +goto finished
  94
  95 +:finished
  96  echo Done compiling OpenSSL
  97
  98  :end
  99 --- misc/openssl-0.9.8k/test/Makefile   2009-03-25 19:59:22.000000000 +0900
 100 +++ misc/build/openssl-0.9.8k/test/Makefile     2009-04-10 20:07:21.522500000 +0900
 101 @@ -402,13 +402,13 @@
 102         if [ "$(FIPSCANLIB)" = "libfips" ]; then \
 103                 LIBRARIES="-L$(TOP) -lfips"; \
 104         elif [ -n "$(FIPSCANLIB)" ]; then \
 105 -               FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 106 +               FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 107                 LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
 108         else \
 109                 LIBRARIES="$(LIBCRYPTO)"; \
 110         fi; \
 111         $(MAKE) -f $(TOP)/Makefile.shared -e \
 112 -               CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
 113 +               CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
 114                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 115                 link_app.$${shlib_target}
 116
 117 @@ -417,11 +417,11 @@
 118         fi; \
 119         LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
 120         if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
 121 -               FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 122 +               FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 123         fi; \
 124         [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
 125         $(MAKE) -f $(TOP)/Makefile.shared -e \
 126 -               CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
 127 +               CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
 128                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 129                 link_app.$${shlib_target}
 130
 131 --- misc/openssl-0.9.8k/util/pl/Mingw32.pl      2006-05-05 15:19:34.000000000 +0200
 132 +++ misc/build/openssl-0.9.8k/util/pl/Mingw32.pl        2009-03-30 11:55:04.000000000 +0200
 133 @@ -6,11 +6,11 @@
 134  $o='/';
 135  $cp='cp';
 136  $rm='rm -f';
 137 -$mkdir='gmkdir';
 138 +#$mkdir='gmkdir';
 139
 140 -$o='\\';
 141 -$cp='copy';
 142 -$rm='del';
 143 +#$o='\\';
 144 +#$cp='copy';
 145 +#$rm='del';
 146  $mkdir='mkdir';
 147
 148  # C compiler stuff
 149 @@ -87,7 +87,8 @@
 150         ($Name=$name) =~ tr/a-z/A-Z/;
 151
 152         $ret.="$target: \$(${Name}OBJ)\n";
 153 -       $ret.="\tif exist $target \$(RM) $target\n";
 154 +    $ret.="\t\$(RM) $target\n";
 155 +#      $ret.="\tif exist $target \$(RM) $target\n";
 156         $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
 157         $ret.="\t\$(RANLIB) $target\n\n";
 158         }