svn commit: r1825848 - in /openoffice/trunk/ext_libraries/apr: apr-1.5.2-windows.patch makefile.mk

[da...@apache.org]

Author: damjan
Date: Mon Mar  5 04:23:29 2018
New Revision: 1825848

URL: http://svn.apache.org/viewvc?rev=1825848&view=rev
Log:
Get ext_libraries/apr building on Win64. Copy its
resulting binaries files from their correct
directories for X86_64, and instead of hardcoding
a 32 bit build, allow 64 bit too, and improve
detection of Win64 to use "findstr.exe" instead
of "find.exe" which doesn't seem to work in Cygwin.

Patch by: me


Modified:
    openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch
    openoffice/trunk/ext_libraries/apr/makefile.mk

Modified: openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch?rev=1825848&r1=1825847&r2=1825848&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch (original)
+++ openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch Mon Mar  5 04:23:29 2018
@@ -1,15 +1,11 @@
---- misc/apr-1.5.2/Makefile.win	2011-01-28 03:27:19.000000000 +0100
-+++ misc/build/apr-1.5.2/Makefile.win	2013-05-27 11:35:37.224622100 +0200
-@@ -45,12 +45,7 @@
- 
+--- misc/build/apr-1.5.2/Makefile.win	2018-03-05 05:48:04.021330400 +0200
++++ misc/build/apr-1.5.2/Makefile.win	2018-03-05 05:58:03.647346500 +0200
+@@ -41,7 +41,7 @@
  PREFIX=..\apr-dist
  
--!IF [$(COMSPEC) /c cl /nologo /? \
+ !IF [$(COMSPEC) /c cl /nologo /? \
 -	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
--ARCH=x64 Release
--!ELSE
++	| findstr.exe "x64" >NUL ] == 0
+ ARCH=x64 Release
+ !ELSE
  ARCH=Win32 Release
--!ENDIF
- 
- !MESSAGE ARCH        = $(ARCH)
- !MESSAGE PREFIX      = $(PREFIX)  (install path)

Modified: openoffice/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/makefile.mk?rev=1825848&r1=1825847&r2=1825848&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr/makefile.mk Mon Mar  5 04:23:29 2018
@@ -46,8 +46,8 @@ TARFILE_MD5=98492e965963f852ab29f9e61b2a
 
 .IF "$(OS)"=="WNT"
 
-PATCH_FILES+= $(TARFILE_NAME)-windows.patch
 PATCH_FILES+= $(TARFILE_NAME)-no-devenv.patch
+PATCH_FILES+= $(TARFILE_NAME)-windows.patch
 CONFIGURE_ACTION=cp include/apr.hw include/apr.h
 BUILD_DIR=
 BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1  nmake -f Makefile.win buildall
@@ -80,6 +80,7 @@ OUT2INC+=include$/apr*.h
 OUT2INC_SUBDIR=apr
 
 .IF "$(OS)"=="WNT"
+.IF "$(CPUNAME)"=="INTEL"
 OUT2LIB+=LibR$/*.lib
 OUT2LIB+=LibR$/*.pdb
 OUT2LIB+=Release$/libaprapp-1.lib
@@ -88,6 +89,16 @@ OUT2LIB+=Release$/libapr-1.lib
 OUT2LIB+=Release$/libapr-1.exp
 OUT2BIN+=Release$/libapr-1.dll
 OUT2BIN+=Release$/libapr-1.pdb
+.ELIF "$(CPUNAME)"=="X86_64"
+OUT2LIB+=x64/LibR$/*.lib
+OUT2LIB+=x64/LibR$/*.pdb
+OUT2LIB+=x64/Release$/libaprapp-1.lib
+OUT2LIB+=x64/Release$/libaprapp-1.pdb
+OUT2LIB+=x64/Release$/libapr-1.lib
+OUT2LIB+=x64/Release$/libapr-1.exp
+OUT2BIN+=x64/Release$/libapr-1.dll
+OUT2BIN+=x64/Release$/libapr-1.pdb
+.ENDIF
 .ELSE
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=.libs/libapr-1.*dylib