[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - openssl/makefile.mk openssl/openssl.patch soltools/javadep

[Damjan Jovanovic]

 openssl/makefile.mk        |   18 ++++++++++++------
 openssl/openssl.patch      |   30 ++++++++++++++++++++++++++++++
 soltools/javadep/javadep.c |   14 +++++++++++++-
 3 files changed, 55 insertions(+), 7 deletions(-)

New commits:
commit dbda740d5e12fb77f3452c3e5515bdad233b91d8
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Mar 7 06:16:30 2018 +0000

    Get openssl to build on Win64.
    
    Patch by: me

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 6762f642d4b2..dc97bb1c7459 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -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
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index b487f8fc5db4..27a01adffaa2 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -122,3 +122,33 @@ diff -ur misc/openssl-1.0.2h/util/pl/VC-32.pl misc/build/openssl-1.0.2h/util/pl/
  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
commit 756f141b6bfa64854d61230201ca9fc9d52a6b78
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Mar 7 05:14:45 2018 +0000

    Update the main/soltools javadep tool to deal with Java 9
    
    (possibily 7 and 8 too, when using invokedynamic).
    
    Patch by: me

diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index e0902ba678b2..06e332f6a6f8 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -93,7 +93,10 @@ enum {
     CONSTANT_Long               = 5,
     CONSTANT_Double             = 6,
     CONSTANT_NameAndType        = 12,
-    CONSTANT_Utf8               = 1
+    CONSTANT_Utf8               = 1,
+    CONSTANT_MethodHandle       = 15,
+    CONSTANT_MethodType         = 16,
+    CONSTANT_InvokeDynamic      = 18
 };
 
 enum { NGROW_INIT = 10, NGROW = 2 };
@@ -512,6 +515,15 @@ process_class_file(const char *pfilename, const struct growable *pfilt)
                 a_utf8 = read_utf8(&file);
                 pc_pool[i] = a_utf8;
                 break;
+            case CONSTANT_MethodHandle:
+                skip_bytes(&file, 3);
+                break;
+            case CONSTANT_MethodType:
+                skip_bytes(&file, 2);
+                break;
+            case CONSTANT_InvokeDynamic:
+                skip_bytes(&file, 4);
+                break;
             default:
                 /* Unknown Constant_pool entry, this means we are
                  * in trouble