Author: damjan
Date: Tue Jul 26 11:16:37 2016
New Revision: 1754110
URL: http://svn.apache.org/viewvc?rev=1754110&view=rev
Log:
The aoo-win7 buildbot is still deadlocking in DEVENV, and I suspect
it's the call to "devenv /help" in the .IF statement that's meant to
detect whether devenv can be found that is causing
the problem, so delete that entire section of code in
apr's Makefile.win.
Added:
openoffice/trunk/ext_libraries/apr/apr-1.5.2-no-devenv.patch
Modified:
openoffice/trunk/ext_libraries/apr/makefile.mk
Added: openoffice/trunk/ext_libraries/apr/apr-1.5.2-no-devenv.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr-1.5.2-no-devenv.patch?rev=1754110&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr/apr-1.5.2-no-devenv.patch (added)
+++ openoffice/trunk/ext_libraries/apr/apr-1.5.2-no-devenv.patch Tue Jul 26
11:16:37 2016
@@ -0,0 +1,17 @@
+diff -Nur Makefile.win Makefile.win
+--- Makefile.win 2013-10-03 12:58:21.000000000 +0200
++++ Makefile.win 2016-07-26 12:59:58.183576182 +0200
+@@ -28,12 +28,7 @@
+ # nmake -f Makefile.win PREFIX=C:\APR buildall checkall install clean
+ #
+
+-!IF EXIST("apr.sln") && ([devenv /help > NUL 2>&1] == 0) \
+- && !defined(USEMAK) && !defined(USEDSW)
+-USESLN=1
+-USEMAK=0
+-USEDSW=0
+-!ELSEIF EXIST("apr.mak") && !defined(USEDSW)
++!IF EXIST("apr.mak") && !defined(USEDSW)
+ USESLN=0
+ USEMAK=1
+ USEDSW=0
Modified: openoffice/trunk/ext_libraries/apr/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/makefile.mk?rev=1754110&r1=1754109&r2=1754110&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr/makefile.mk Tue Jul 26 11:16:37 2016
@@ -47,6 +47,7 @@ TARFILE_MD5=98492e965963f852ab29f9e61b2a
.IF "$(OS)"=="WNT"
PATCH_FILES+= $(TARFILE_NAME)-windows.patch
+PATCH_FILES+= $(TARFILE_NAME)-no-devenv.patch
CONFIGURE_ACTION=cp include/apr.hw include/apr.h
BUILD_DIR=
BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1 nmake -f Makefile.win
buildall
