openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1826081 - in /openoffice/trunk/main/openssl: makefile.mk openssl.patch
Date Wed, 07 Mar 2018 06:16:30 GMT
Author: damjan
Date: Wed Mar  7 06:16:30 2018
New Revision: 1826081

URL: http://svn.apache.org/viewvc?rev=1826081&view=rev
Log:
Get openssl to build on Win64.

Patch by: me


Modified:
    openoffice/trunk/main/openssl/makefile.mk
    openoffice/trunk/main/openssl/openssl.patch

Modified: openoffice/trunk/main/openssl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/makefile.mk?rev=1826081&r1=1826080&r2=1826081&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/makefile.mk (original)
+++ openoffice/trunk/main/openssl/makefile.mk Wed Mar  7 06:16:30 2018
@@ -151,12 +151,18 @@ OUT2BIN += out/libeay32.dll
 		.ENDIF
 
 		#CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
-		CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
-		CONFIGURE_FLAGS=VC-WIN32
-		.IF "$(NASM_PATH)"=="NO_NASM_HOME"
-		  BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" &&
nmake -f ms/ntdll.mak
-		.ELSE
-		  BUILD_ACTION=cmd /c "ms$(EMQ)\do_nasm.bat $(subst,/,\ $(normpath,1 $(PERL)))" &&
nmake -f ms/ntdll.mak
+		.IF "$(CPUNAME)"=="INTEL"
+			CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
+			CONFIGURE_FLAGS=VC-WIN32
+			.IF "$(NASM_PATH)"=="NO_NASM_HOME"
+			  BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" &&
nmake -f ms/ntdll.mak
+			.ELSE
+			  BUILD_ACTION=cmd /c "ms$(EMQ)\do_nasm.bat $(subst,/,\ $(normpath,1 $(PERL)))" &&
nmake -f ms/ntdll.mak
+			.ENDIF
+		.ELIF "$(CPUNAME)"=="X86_64"
+			CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
+			CONFIGURE_FLAGS=VC-WIN64A
+			BUILD_ACTION=cmd /c "ms$(EMQ)\do_win64a.bat $(subst,/,\ $(normpath,1 $(PERL)))" &&
cmd /c "nmake -f ms/ntdll.mak"
 		.ENDIF
 
 		OUT2LIB = out32dll$/ssleay32.lib

Modified: openoffice/trunk/main/openssl/openssl.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssl.patch?rev=1826081&r1=1826080&r2=1826081&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssl.patch (original)
+++ openoffice/trunk/main/openssl/openssl.patch Wed Mar  7 06:16:30 2018
@@ -122,3 +122,33 @@ diff -ur misc/openssl-1.0.2h/util/pl/VC-
  if ($FLAVOR =~ /WIN64/)
      {
      # Note that we currently don't have /WX on Win64! There is a lot of
+diff -Nur misc/build/openssl-1.0.2h/ms/do_win64a.bat misc/build/openssl-1.0.2h/ms/do_win64a.bat
+--- misc/build/openssl-1.0.2h/ms/do_win64a.bat	2016-05-03 15:44:42.000000000 +0200
++++ misc/build/openssl-1.0.2h/ms/do_win64a.bat	2018-03-07 07:59:41.870638000 +0200
+@@ -1,19 +1,19 @@
+-perl util\mkfiles.pl >MINFO
++%1 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
++%1 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
++%1 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
++%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak
++%1 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
++%1 util\mkdef.pl 32 libeay > ms\libeay32.def
++%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def



Mime
View raw message