You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2016/07/25 22:56:23 UTC

svn commit: r1754057 - /openoffice/trunk/ext_libraries/apr/makefile.mk

Author: damjan
Date: Mon Jul 25 22:56:23 2016
New Revision: 1754057

URL: http://svn.apache.org/viewvc?rev=1754057&view=rev
Log:
apr has 3 different ways of building. By default, if devenv
is in the $PATH, it is used. If not, and apr.mak is found,
nmake is used. Failing both, msdev is used.

On the buildbots, devenv is somehow in the $PATH, even when
VCVARS32.BAT is not run, causing the first way to be
used. This causes some kind of deadlock that hangs the
build and prevents deletion of Makefile.win until devenv
is killed.

We know the nmake way works, so force it to be used instead.

Patch by: me


Modified:
    openoffice/trunk/ext_libraries/apr/makefile.mk

Modified: openoffice/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/makefile.mk?rev=1754057&r1=1754056&r2=1754057&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr/makefile.mk Mon Jul 25 22:56:23 2016
@@ -49,7 +49,7 @@ TARFILE_MD5=98492e965963f852ab29f9e61b2a
 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
+BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1  nmake -f Makefile.win buildall
 
 .ELIF "$(GUI)" == "OS2"