Attachment 115830 Details for Bug 91480 – libwps patch for testing

libwps patch for testing

0001-build-shared-lib-on-windows.patch (text/plain), 1.64 KB, created by David Tardon on 2015-05-22 14:32:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Tardon

Created: 2015-05-22 14:32:40 UTC

Size: 1.64 KB

patch

obsolete

>From e2383bb94e0460f1f9aedec0fc9e788d1dbbc232 Mon Sep 17 00:00:00 2001
>From: David Tardon <dtardon@redhat.com>
>Date: Fri, 22 May 2015 16:23:50 +0200
>Subject: [PATCH] build shared lib on windows
>
>Change-Id: Ie479d12cef14f26363bcf869c5acac65c68ba600
>---
> RepositoryExternal.mk            | 22 ----------------------
> external/libwps/Module_libwps.mk | 10 ----------
> 2 files changed, 32 deletions(-)
>
>diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
>index 47e4d17..680b9f8 100644
>--- a/RepositoryExternal.mk
>+++ b/RepositoryExternal.mk
>@@ -2160,26 +2160,6 @@ gb_ExternalProject__use_wps :=
> 
> else # !SYSTEM_WPS
> 
>-ifeq ($(COM),MSC)
>-
>-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
>-	wps \
>-))
>-
>-define gb_LinkTarget__use_wps
>-$(call gb_LinkTarget_set_include,$(1),\
>-	-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
>-	$$(INCLUDE) \
>-)
>-
>-$(call gb_LinkTarget_use_libraries,$(1),\
>-	wps \
>-)
>-
>-endef
>-
>-else # !MSC
>-
> $(eval $(call gb_Helper_register_packages_for_install,ooo, \
> 	libwps \
> ))
>@@ -2197,8 +2177,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
> 
> endef
> 
>-endif # MSC
>-
> endif # SYSTEM_WPS
> 
> 
>diff --git a/external/libwps/Module_libwps.mk b/external/libwps/Module_libwps.mk
>index 2b52c4a..fe0d3d7 100644
>--- a/external/libwps/Module_libwps.mk
>+++ b/external/libwps/Module_libwps.mk
>@@ -13,19 +13,9 @@ $(eval $(call gb_Module_add_targets,libwps,\
> 	UnpackedTarball_libwps \
> ))
> 
>-ifeq ($(COM),MSC)
>-
>-$(eval $(call gb_Module_add_targets,libwps,\
>-	Library_wps \
>-))
>-
>-else
>-
> $(eval $(call gb_Module_add_targets,libwps,\
> 	ExternalPackage_libwps \
> 	ExternalProject_libwps \
> ))
> 
>-endif
>-
> # vim: set noet sw=4 ts=4:
>-- 
>2.4.1
>

Actions: View

Attachments on bug 91480: 115830