ooo-build r12634 - in trunk: . patches/dev300
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12634 - in trunk: . patches/dev300
- Date: Thu, 22 May 2008 17:08:59 +0000 (UTC)
Author: jholesovsky
Date: Thu May 22 17:08:59 2008
New Revision: 12634
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12634&view=rev
Log:
2008-05-22 Jan Holesovsky <kendy suse cz>
* patches/dev300/link-as-needed.diff: Fix --as-needed build in
cppcanvas and svx.
Modified:
trunk/ChangeLog
trunk/patches/dev300/link-as-needed.diff
Modified: trunk/patches/dev300/link-as-needed.diff
==============================================================================
--- trunk/patches/dev300/link-as-needed.diff (original)
+++ trunk/patches/dev300/link-as-needed.diff Thu May 22 17:08:59 2008
@@ -44,3 +44,28 @@
OBJFILES = $(APP1OBJS)
+diff --git cppcanvas/util/makefile.mk cppcanvas/util/makefile.mk
+index 4fa5931..7a3cec0 100644
+--- cppcanvas/util/makefile.mk
++++ cppcanvas/util/makefile.mk
+@@ -50,7 +50,7 @@ LIB1FILES=\
+
+ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+ SHL1IMPLIB= i$(TARGET)
+-SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(SVTOOLLIB)
++SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB) $(SVTOOLLIB)
+
+ SHL1LIBS= $(SLB)$/$(TARGET).lib
+
+diff --git svx/util/makefile.mk svx/util/makefile.mk
+index 4598098..d5de0b6 100644
+--- svx/util/makefile.mk
++++ svx/util/makefile.mk
+@@ -172,7 +172,6 @@ SHL2STDLIBS= \
+ $(I18NISOLANGLIB) \
+ $(COMPHELPERLIB) \
+ $(UCBHELPERLIB) \
+- $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(VOSLIB) \
+ $(SALLIB) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]