Attachment 49817 Details for Bug 39741 – revised patch for point 1), including libvisio

[patch] revised patch for point 1), including libvisio

0001-Proper-handling-of-system-libvisio-wpd-wpg-wps.patch (text/plain), 1.69 KB, created by Lionel Elie Mamane on 2011-08-02 02:50:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lionel Elie Mamane

Created: 2011-08-02 02:50:52 UTC

Size: 1.69 KB

patch

obsolete

>From 6aa87ad997c53c54be60401af2d6aec4dc8cb4b6 Mon Sep 17 00:00:00 2001
>From: Lionel Elie Mamane <lionel@mamane.lu>
>Date: Tue, 2 Aug 2011 07:10:30 +0200
>Subject: [PATCH 1/2] Proper handling of system libvisio, wpd, wpg, wps
>
>---
> RepositoryExternal.mk |   25 +++++++++++++++++++++----
> 1 files changed, 21 insertions(+), 4 deletions(-)
>
>diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
>index cf0e6a8..8ab4f3a 100644
>--- a/RepositoryExternal.mk
>+++ b/RepositoryExternal.mk
>@@ -441,7 +441,12 @@ endif # SYSTEM_OPENSSL
> ifeq ($(SYSTEM_LIBVISIO),YES)
> 
> define gb_LinkTarget__use_visio
>-$(call gb_LinkTarget_add_libs,$(1),-llibvisio)
>+define gb_LinkTarget__use_wpd
>+$(call gb_LinkTarget_set_include,$(1),\
>+	$$(INCLUDE) \
>+    $(LIBVISIO_CFLAGS) \
>+)
>+$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS))
> 
> endef
> 
>@@ -464,7 +469,11 @@ endif # SYSTEM_LIBVISIO
> ifeq ($(SYSTEM_LIBWPD),YES)
> 
> define gb_LinkTarget__use_wpd
>-$(call gb_LinkTarget_add_libs,$(1),-llibwpd)
>+$(call gb_LinkTarget_set_include,$(1),\
>+	$$(INCLUDE) \
>+    $(LIBWPD_CFLAGS) \
>+)
>+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
> 
> endef
> 
>@@ -487,7 +496,11 @@ endif # SYSTEM_LIBWPD
> ifeq ($(SYSTEM_LIBWPG),YES)
> 
> define gb_LinkTarget__use_wpg
>-$(call gb_LinkTarget_add_libs,$(1),-llibwpg)
>+$(call gb_LinkTarget_set_include,$(1),\
>+	$$(INCLUDE) \
>+    $(LIBWPG_CFLAGS) \
>+)
>+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS))
> 
> endef
> 
>@@ -510,7 +523,11 @@ endif # SYSTEM_LIBWPG
> ifeq ($(SYSTEM_LIBWPS),YES)
> 
> define gb_LinkTarget__use_wps
>-$(call gb_LinkTarget_add_libs,$(1),-llibwps)
>+$(call gb_LinkTarget_set_include,$(1),\
>+	$$(INCLUDE) \
>+    $(LIBWPS_CFLAGS) \
>+)
>+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
> 
> endef
> 
>-- 
>1.7.2.5
>

Actions: View | Splinter Review

Attachments on bug 39741: 49812 | 49813 | 49814 | 49816 | 49817

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.