Author: damjan
Date: Mon Aug 1 18:31:28 2016
New Revision: 1754789
URL: http://svn.apache.org/viewvc?rev=1754789&view=rev
Log:
Fix the apr-util build on Windows.
gb_Library_set_defs has been replaced by
gb_Library_add_defs.
Patch by: me
Modified:
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
Modified:
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch?rev=1754789&r1=1754788&r2=1754789&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
(original)
+++
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
Mon Aug 1 18:31:28 2016
@@ -1,6 +1,6 @@
--- misc/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:49:40.529219100
+0100
+++ misc/build/apr-util-1.5.4/Library_apr-util.mk 2012-01-05
14:47:18.621102400 +0100
-@@ -1 +1,90 @@
+@@ -1 +1,89 @@
-dummy
+#/**************************************************************
+# *
@@ -34,8 +34,7 @@
+ -I$(OUTDIR)/inc/apr \
+))
+
-+$(eval $(call gb_Library_set_defs,apr-util,\
-+ $$(DEFS) \
++$(eval $(call gb_Library_add_defs,apr-util,\
+ -DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL
-DWIN32_EXPORTS \
+))
+
