Author: arielch
Date: Sat Dec 3 00:01:57 2016
New Revision: 1772417
URL: http://svn.apache.org/viewvc?rev=1772417&view=rev
Log:
i127235 - Windows bb hangs in apr
Cherrypicked Revision 1754110 from trunk
Added:
openoffice/branches/AOO414/ext_libraries/apr/apr-1.4.5-no-devenv.patch
Modified:
openoffice/branches/AOO414/ext_libraries/apr/makefile.mk
Added: openoffice/branches/AOO414/ext_libraries/apr/apr-1.4.5-no-devenv.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO414/ext_libraries/apr/apr-1.4.5-no-devenv.patch?rev=1772417&view=auto
==============================================================================
--- openoffice/branches/AOO414/ext_libraries/apr/apr-1.4.5-no-devenv.patch
(added)
+++ openoffice/branches/AOO414/ext_libraries/apr/apr-1.4.5-no-devenv.patch Sat
Dec 3 00:01:57 2016
@@ -0,0 +1,16 @@
+--- misc/build/apr-1.4.5/Makefile.win 2013-10-03 12:58:21.000000000 +0200
++++ misc/build/apr-1.4.5/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/branches/AOO414/ext_libraries/apr/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO414/ext_libraries/apr/makefile.mk?rev=1772417&r1=1772416&r2=1772417&view=diff
==============================================================================
--- openoffice/branches/AOO414/ext_libraries/apr/makefile.mk (original)
+++ openoffice/branches/AOO414/ext_libraries/apr/makefile.mk Sat Dec 3
00:01:57 2016
@@ -49,9 +49,10 @@ PATCH_FILES= $(TARFILE_NAME).patch
.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" nmake -f Makefile.win buildall
+BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1 nmake -f Makefile.win
buildall
.ELIF "$(GUI)" == "OS2"
