Files
libreoffice/openssl/opensslmingw.patch
Vladimir Glazounov 0942e37bd7 INTEGRATION: CWS mingwport11 (1.2.4); FILE MERGED
2008/02/08 17:44:42 vg 1.2.4.1: #i85952# catch-up fix for mingwport
2008-02-12 15:04:49 +00:00

120 lines
3.8 KiB
Diff
Executable File

*** misc/openssl-0.9.8g/Makefile.shared Sun Sep 16 23:11:51 2007
--- misc/build/openssl-0.9.8g/Makefile.shared Mon Feb 4 21:12:51 2008
***************
*** 238,251 ****
SHLIB=cyg$(LIBNAME); \
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
! SHLIB=$(LIBNAME)eay32; base=; \
fi; \
SHLIB_SUFFIX=.dll; \
LIBVERSION="$(LIBVERSION)"; \
! SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
$(LINK_SO_O)
link_a.cygwin:
@ $(CALC_VERSIONS); \
--- 238,255 ----
SHLIB=cyg$(LIBNAME); \
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
! SHLIB=$(LIBNAME)eay32; \
! if test $(LIBNAME) = "crypto"; then \
! SHLIB=libeay32; \
! fi; \
! base=; \
fi; \
SHLIB_SUFFIX=.dll; \
LIBVERSION="$(LIBVERSION)"; \
! SHLIB_SOVER=; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
$(LINK_SO_O)
link_a.cygwin:
@ $(CALC_VERSIONS); \
*** misc/openssl-0.9.8g/ms/mingw32.bat Fri May 5 22:19:33 2006
--- misc/build/openssl-0.9.8g/ms/mingw32.bat Mon Feb 4 20:11:50 2008
***************
*** 79,91 ****
rem copy ms\tlhelp32.h outinc
echo Building the libraries
! mingw32-make -f ms/mingw32a.mak
if errorlevel 1 goto end
echo Generating the DLLs and input libraries
! dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
if errorlevel 1 goto end
! dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
if errorlevel 1 goto end
echo Done compiling OpenSSL
--- 79,97 ----
rem copy ms\tlhelp32.h outinc
echo Building the libraries
! make -f ms/mingw32a.mak
if errorlevel 1 goto end
echo Generating the DLLs and input libraries
! mv out/libcrypto.a out/libcrypto_static.a
! mv out/libssl.a out/libssl_static.a
! dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
if errorlevel 1 goto end
! gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
! if errorlevel 1 goto end
! dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
! if errorlevel 1 goto end
! gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
if errorlevel 1 goto end
echo Done compiling OpenSSL
*** misc/openssl-0.9.8g/util/pl/Mingw32.pl Fri May 5 22:19:35 2006
--- misc/build/openssl-0.9.8g/util/pl/Mingw32.pl Mon Feb 4 21:11:50 2008
***************
*** 6,16 ****
$o='/';
$cp='cp';
$rm='rm -f';
! $mkdir='gmkdir';
! $o='\\';
! $cp='copy';
! $rm='del';
$mkdir='mkdir';
# C compiler stuff
--- 6,16 ----
$o='/';
$cp='cp';
$rm='rm -f';
! #$mkdir='gmkdir';
! #$o='\\';
! #$cp='copy';
! #$rm='del';
$mkdir='mkdir';
# C compiler stuff
***************
*** 87,93 ****
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
! $ret.="\tif exist $target \$(RM) $target\n";
$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
$ret.="\t\$(RANLIB) $target\n\n";
}
--- 87,94 ----
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
! $ret.="\t\$(RM) $target\n";
! # $ret.="\tif exist $target \$(RM) $target\n";
$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
$ret.="\t\$(RANLIB) $target\n\n";
}