You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/06/15 06:15:13 UTC
svn commit: r1493304 - in /openoffice/trunk/ext_libraries/apr-util:
apr-util-1.4.1.expat.patch makefile.mk
Author: arielch
Date: Sat Jun 15 04:15:13 2013
New Revision: 1493304
URL: http://svn.apache.org/r1493304
Log:
i122486 - Use internal expat
apr
Modified:
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
openoffice/trunk/ext_libraries/apr-util/makefile.mk
Modified: openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch?rev=1493304&r1=1493303&r2=1493304&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch (original)
+++ openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch Sat Jun 15 04:15:13 2013
@@ -1,11 +1,12 @@
---- misc/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.000000000 +0200
-+++ misc/build/apr-util-1.4.1/build/apu-conf.m4 2012-02-22 16:39:05.000000000 +0100
-@@ -87,8 +87,13 @@
+--- misc/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 06:32:27.000000000 -0300
++++ misc/build/apr-util-1.4.1/build/apu-conf.m4 2013-06-12 20:09:05.877947541 -0300
+@@ -87,8 +87,14 @@ dnl be dropped later.
dnl
AC_DEFUN([APU_SYSTEM_EXPAT], [
+ APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
-+ [expat.h], [-lexpat_xmlparse -lexpat_xmltok])
++ [expat.h], [-L"$SOLARLIBDIR" -lexpat_xmlparse -lexpat_xmltok],
++ [APR_ADDTO(APRUTIL_INCLUDES, [-I"$SOLARINCDIR"/external])] )
+
+ if test $apu_has_expat = 0; then
APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system,
Modified: openoffice/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/makefile.mk?rev=1493304&r1=1493303&r2=1493304&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr-util/makefile.mk Sat Jun 15 04:15:13 2013
@@ -86,7 +86,11 @@ CONFIGURE_FLAGS= \
# Use our own expat on the Mac. Maybe we should do this on Linux, too? Yes!
.IF "$(OS)" == "MACOSX" || ("$(OS)" == "LINUX" && "$(SYSTEM_EXPAT)"!="YES")
-CONFIGURE_FLAGS+= --with-expat=$(OUTDIR)
+expat_CPPFLAGS=-I$(SOLARINCDIR)$/external
+expat_LDFLAGS+=-L$(SOLARLIBDIR)
+CONFIGURE_FLAGS+= SOLARINCDIR=$(SOLARINCDIR) SOLARLIBDIR=$(SOLARLIBDIR) \
+ CPPFLAGS=$(expat_CPPFLAGS) LDFLAGS=$(expat_LDFLAGS)
+
# The non-standard names of our expat libraries (yes, plural) make
# a special handling in apr-utils configure necessary.
PATCH_FILES+= $(TARFILE_NAME).expat.patch