Author: orw
Date: Mon May 27 10:38:34 2013
New Revision: 1486564
URL: http://svn.apache.org/r1486564
Log:
module apr: simplify apr's Windows makefile to avoid possible hanging process
on buildbots
Added:
openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch
Modified:
openoffice/trunk/ext_libraries/apr/makefile.mk
Added: openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch?rev=1486564&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch (added)
+++ openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch Mon May 27
10:38:34 2013
@@ -0,0 +1,15 @@
+--- misc/apr-1.4.5/Makefile.win 2011-01-28 03:27:19.000000000 +0100
++++ misc/build/apr-1.4.5/Makefile.win 2013-05-27 11:35:37.224622100 +0200
+@@ -45,12 +45,7 @@
+
+ PREFIX=..\apr-dist
+
+-!IF [$(COMSPEC) /c cl /nologo /? \
+- | $(SystemRoot)\System32\find.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=1486564&r1=1486563&r2=1486564&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr/makefile.mk Mon May 27 10:38:34 2013
@@ -44,16 +44,15 @@ APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(A
TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
-PATCH_FILES=apr-1.4.5.patch
+PATCH_FILES= $(TARFILE_NAME).patch
.IF "$(OS)"=="WNT"
+PATCH_FILES+= $(TARFILE_NAME)-windows.patch
CONFIGURE_ACTION=cp include/apr.hw include/apr.h
BUILD_DIR=
BUILD_ACTION=INCLUDE="$(INCLUDE);./include" nmake -f Makefile.win buildall
-#INSTALL_ACTION=cp Release/libapr-1.lib $(OUTDIR)/lib/libapr-1.lib
-
.ELIF "$(GUI)" == "OS2"
@all:
