Kaydet (Commit) 38f259e7 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

win64: make openssl work

fix windows style path separator to unix style, needed for cygwin.

Change-Id: I4de78d6901378644857c28a59467b59ef886f47b
Reviewed-on: https://gerrit.libreoffice.org/10855Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst 487c48b8
......@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
$(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) \
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \
......
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":"");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment