da85248be7
- updated to libreoffice-3.5.5.2 (3.5.2-rc2) - did some clean up OBS-URL: https://build.opensuse.org/request/show/112476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=30
74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
From 29fe15039fd1d99b9597c51c96e1c429bcdcefe3 Mon Sep 17 00:00:00 2001
|
|
From: Petr Mladek <pmladek@suse.cz>
|
|
Date: Tue, 23 Aug 2011 18:56:03 +0200
|
|
Subject: [PATCH] fix library link order to build with --as-needed
|
|
|
|
---
|
|
connectivity/source/drivers/kab/makefile.mk | 4 ++--
|
|
fpicker/source/unx/kde/makefile.mk | 7 +++++--
|
|
sfx2/Library_qstart.mk | 4 ++++
|
|
shell/source/backends/kdebe/makefile.mk | 5 +++--
|
|
4 files changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
|
|
index 13d4857..1894558 100755
|
|
--- a/connectivity/source/drivers/kab/makefile.mk
|
|
+++ b/connectivity/source/drivers/kab/makefile.mk
|
|
@@ -110,14 +110,14 @@ SHL2VERSIONMAP=$(TARGET2).map
|
|
|
|
SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
|
|
SHL2OBJS=$(SLO2FILES)
|
|
-SHL2LINKFLAGS+=$(KAB_LIB)
|
|
SHL2STDLIBS=\
|
|
$(CPPULIB) \
|
|
$(CPPUHELPERLIB) \
|
|
$(SALLIB) \
|
|
$(SALHELPERLIB) \
|
|
$(DBTOOLSLIB) \
|
|
- $(COMPHELPERLIB)
|
|
+ $(COMPHELPERLIB) \
|
|
+ $(KAB_LIB)
|
|
|
|
SHL2DEPN=
|
|
SHL2IMPLIB= i$(TARGET2)
|
|
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
|
|
index e1bc4db..d131aa9 100644
|
|
--- a/fpicker/source/unx/kde/makefile.mk
|
|
+++ b/fpicker/source/unx/kde/makefile.mk
|
|
@@ -60,8 +60,11 @@ SLOFILES =\
|
|
APP1TARGET=$(TARGET)
|
|
APP1OBJS=$(SLOFILES)
|
|
APP1RPATH=OOO
|
|
-APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
|
|
-APP1STDLIBS=$(SALLIB)
|
|
+APP1STDLIBS=\
|
|
+ $(SALLIB) \
|
|
+ $(KDE_LIBS) \
|
|
+ -lkio \
|
|
+ -lX11
|
|
|
|
.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
|
|
|
|
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
|
|
index b1b12ad..265a3b6 100755
|
|
--- a/shell/source/backends/kdebe/makefile.mk
|
|
+++ b/shell/source/backends/kdebe/makefile.mk
|
|
@@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES)
|
|
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
|
|
|
|
SHL1IMPLIB=i$(SHL1TARGET)
|
|
-SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
|
|
SHL1STDLIBS= \
|
|
$(CPPUHELPERLIB) \
|
|
$(CPPULIB) \
|
|
- $(SALLIB)
|
|
+ $(SALLIB) \
|
|
+ $(KDE_LIBS) \
|
|
+ -lkio
|
|
|
|
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
|
|
DEF1NAME=$(SHL1TARGET)
|
|
--
|
|
1.7.8.3
|
|
|