You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/06/29 13:21:58 UTC
svn commit: r1355320 - in /incubator/ooo/trunk/ext_libraries/serf:
makefile.mk serf-1.0.0.ldl.patch serf-1.1.0.ldl.patch serf-1.1.0.libs.patch
serf-1.1.0.mac.patch
Author: af
Date: Fri Jun 29 11:21:57 2012
New Revision: 1355320
URL: http://svn.apache.org/viewvc?rev=1355320&view=rev
Log:
#i120041# Reactivated some serf patches.
Added:
incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch
- copied unchanged from r1355248, incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch
incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.libs.patch
- copied unchanged from r1355248, incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch
Removed:
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch
incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch
Modified:
incubator/ooo/trunk/ext_libraries/serf/makefile.mk
Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1355320&r1=1355319&r2=1355320&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Fri Jun 29 11:21:57 2012
@@ -68,12 +68,12 @@ BUILD_FLAGS+= -f ../../../../win/Makefil
.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
# Do not link against expat. It is not necessary (apr-util is already linked against it)
# and does not work (we use a different expat library schema.)
-#PATCH_FILES+=$(TARFILE_NAME).mac.patch
+PATCH_FILES+=$(TARFILE_NAME).libs.patch
.ENDIF
.IF "$(OS)"=="LINUX"
# Add -ldl as last library so that the linker has no trouble resolving dependencies.
-#PATCH_FILES+=$(TARFILE_NAME).ldl.patch
+PATCH_FILES+=$(TARFILE_NAME).ldl.patch
.ENDIF
CONFIGURE_DIR=