diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-10 04:08:27 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-08-19 01:48:17 +0200 |
| commit | 0208d843f7c6238e0bbd88df6e5ea33ecc6b2a1f (patch) | |
| tree | 4e658c71dde903ce00e5bb7638258bded57e3040 | |
| parent | e39081a08941b39c98decc8a5709cbdb170b935b (diff) | |
win64: make openssl work
fix windows style path separator to unix style, needed for cygwin.
Change-Id: I4de78d6901378644857c28a59467b59ef886f47b
Reviewed-on: https://gerrit.libreoffice.org/10855
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 2 | ||||
| -rw-r--r-- | external/openssl/openssl-1.0.1h-win64.patch.1 | 47 |
2 files changed, 49 insertions, 0 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index a14204d4c966..5517688c7b6c 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -45,6 +45,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ $(if $(filter LINUX FREEBSD ANDROID,$(OS)),external/openssl/openssllnx.patch) \ $(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \ $(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \ + $(if $(filter MSC,$(COM)),external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1) \ + $(if $(filter MSC,$(COM)),external/openssl/openssl-1.0.1h-win64.patch.1) \ $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ )) diff --git a/external/openssl/openssl-1.0.1h-win64.patch.1 b/external/openssl/openssl-1.0.1h-win64.patch.1 new file mode 100644 index 000000000000..aea914633ebb --- /dev/null +++ b/external/openssl/openssl-1.0.1h-win64.patch.1 @@ -0,0 +1,47 @@ +diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat +index 8768dc6..6772390 100755 +--- a/ms/do_win64a.bat ++++ b/ms/do_win64a.bat +@@ -1,19 +1,19 @@ +-perl util\mkfiles.pl >MINFO ++perl util/mkfiles.pl >MINFO + + cmd /c "nasm -f win64 -v" >NUL 2>&1 + if %errorlevel% neq 0 goto ml64 + +-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm +-nasm -f win64 -o ms\uptable.obj ms\uptable.asm ++perl ms/uplink-x86_64.pl nasm > ms/uptable.asm ++nasm -f win64 -o ms/uptable.obj ms/uptable.asm + goto proceed + + :ml64 +-perl ms\uplink-x86_64.pl masm > ms\uptable.asm +-ml64 -c -Foms\uptable.obj ms\uptable.asm ++perl ms/uplink-x86_64.pl masm > ms/uptable.asm ++ml64 -c -Foms/uptable.obj ms/uptable.asm + + :proceed +-perl util\mk1mf.pl VC-WIN64A >ms\nt.mak +-perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak ++perl util/mk1mf.pl VC-WIN64A >ms/nt.mak ++perl util/mk1mf.pl dll VC-WIN64A >ms/ntdll.mak + +-perl util\mkdef.pl 32 libeay > ms\libeay32.def +-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def ++perl util/mkdef.pl 32 libeay > ms/libeay32.def ++perl util/mkdef.pl 32 ssleay > ms/ssleay32.def +diff --git a/util/mk1mf.pl b/util/mk1mf.pl +index 72fa089..d98def1 100755 +--- a/util/mk1mf.pl ++++ b/util/mk1mf.pl +@@ -233,6 +233,9 @@ else + $cflags.=' -DTERMIO'; + } + ++# force unix style path separator ++${o} = "/"; ++ + $fipsdir =~ s/\//${o}/g; + + $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":""); |