[Libreoffice-commits] core.git: 2 commits - extensions/Executable_pluginapp.bin.mk RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk                  |    8 ++++++++
 extensions/Executable_pluginapp.bin.mk |    4 ++++
 2 files changed, 12 insertions(+)

New commits:
commit 122a137672d761418a549568ad8cad623dd2b4b5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 01:06:43 2013 +0200

    extensions: crude hack for mysterious cairo link failure
    
    Why is /usr/lib64/libpixman-1.so not found automatically?
    
    Change-Id: Ide3929b53d130aee44ff6b01dcf2f7491a61a09b

diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 531aabd..fb01602 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -71,6 +71,10 @@ $(eval $(call gb_Executable_use_externals,pluginapp.bin,\
     gthread \
     gtk \
 ))
+# FIXME: on Fedora 19 link fails with unresolved symbols in cairo without this?
+$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
+	-lpixman-1 \
+))
 
 # the orignal dmakefile said: don't ask, it's ugly
 ifeq ($(OS),SOLARIS)
commit 831aaef3a114ef59826fc49a9c8e27d9538d0db5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 01:09:35 2013 +0200

    redland: unbreak this for MSC
    
    Change-Id: Ifb1e841ed342103651e7d34d9bb47563c4015b23

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e740609..e4de1d0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -992,10 +992,18 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 
 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_use_libraries,$(1),\
+	raptor2 \
+	rdf \
+)
+else
 $(call gb_LinkTarget_add_libs,$(1),\
 	-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
 	-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
 )
+endif
 
 endef