/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.6.9999-parins.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.6.9999-parins.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Jun 19 20:24:29 2012 UTC (2 years, 2 months ago) by dilfridge
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Patch is upstreamed

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

1 From 93b83cfc04c37ed25450c33b31042d4b58ba88e2 Mon Sep 17 00:00:00 2001
2 From: David Tardon <dtardon@redhat.com>
3 Date: Sat, 16 Jun 2012 07:19:41 +0200
4 Subject: [PATCH] change the way par files for ins are collected
5
6 This avoids the need for $(wildcard), which seemed to cause problems in
7 some cases (in gentoo ebuild) and I never found any missing dependency
8 that might account for it.
9
10 Change-Id: Ia03d630bb85309fbb7da3068c396834fb56cffb1
11 ---
12 solenv/gbuild/InstallModule.mk | 6 +++---
13 solenv/gbuild/InstallModuleTarget.mk | 12 ++++++------
14 solenv/gbuild/InstallScript.mk | 17 ++++++++++-------
15 solenv/gbuild/TargetLocations.mk | 6 ++++--
16 4 files changed, 23 insertions(+), 18 deletions(-)
17
18 diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
19 index f1b9dbe..7ff5a9e 100644
20 --- a/solenv/gbuild/InstallModule.mk
21 +++ b/solenv/gbuild/InstallModule.mk
22 @@ -45,7 +45,6 @@ $(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_wo
23 $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1))
24 $(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par)
25 $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
26 -$(call gb_Package_get_preparation_target,$(1)_par) :| $(call gb_InstallModuleTarget_get_target,$(1))
27 $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
28 $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_par)
29
30 @@ -89,12 +88,12 @@ $(call gb_InstallModuleTarget_use_packages,$(1),$(2))
31 endef
32
33 define gb_InstallModule__add_scpfile_impl
34 -$(call gb_Package_add_file,$(1)_par,par/osl/$(2),$(2))
35 +$(call gb_Package_add_file,$(1)_par,par/osl/$(notdir $(2)),$(2))
36
37 endef
38
39 define gb_InstallModule__add_scpfile
40 -$(call gb_InstallModule__add_scpfile_impl,$(1),$(notdir $(call gb_ScpTarget_get_target,$(2))))
41 +$(call gb_InstallModule__add_scpfile_impl,$(1),$(dir $(2))$(notdir $(call gb_ScpTarget_get_target,$(2))))
42
43 endef
44
45 @@ -123,6 +122,7 @@ endef
46
47 define gb_InstallModule_add_localized_scpfiles
48 $(call gb_InstallModuleTarget_add_localized_scpfiles,$(1),$(2))
49 +$(call gb_InstallModule__add_scpfiles,$(1),$(2))
50
51 endef
52
53 diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
54 index 1b717a7..3d7fcd0 100644
55 --- a/solenv/gbuild/InstallModuleTarget.mk
56 +++ b/solenv/gbuild/InstallModuleTarget.mk
57 @@ -265,15 +265,17 @@ endef
58
59 define gb_InstallModuleTarget__command
60 $(call gb_Output_announce,$(2),$(true),INM,3)
61 -$(foreach scpfile,$(SCP_FILES),$(call gb_Deliver_deliver,$(scpfile),$(3)/$(notdir $(scpfile))) &&) \
62 -touch $(1)
63 +$(call gb_Helper_abbreviate_dirs,\
64 + rm -f $(1) \
65 + $(foreach scpfile,$(SCP_FILES),&& echo $(scpfile) >> $(1)) \
66 +)
67 endef
68
69 $(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir :
70 $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
71
72 $(call gb_InstallModuleTarget_get_target,%) :
73 - $(call gb_InstallModuleTarget__command,$@,$*,$(call gb_InstallModuleTarget_get_workdir,$*))
74 + $(call gb_InstallModuleTarget__command,$@,$*)
75
76 $(call gb_InstallModuleTarget_get_external_target,%) :
77 touch $@
78 @@ -282,14 +284,12 @@ $(call gb_InstallModuleTarget_get_external_target,%) :
79 $(call gb_InstallModuleTarget_get_clean_target,%) :
80 $(call gb_Output_announce,$*,$(false),INM,3)
81 rm -rf \
82 - $(call gb_InstallModuleTarget_get_workdir,$*) \
83 $(call gb_InstallModuleTarget_get_target,$*) \
84 $(call gb_InstallModuleTarget_get_external_target,$*)
85
86 define gb_InstallModuleTarget_InstallModuleTarget
87 $(call gb_InstallModuleTarget_get_target,$(1)) :| \
88 - $(call gb_InstallModuleTarget_get_external_target,$(1)) \
89 - $(call gb_InstallModuleTarget_get_workdir,$(1))/.dir
90 + $(call gb_InstallModuleTarget_get_external_target,$(1))
91 $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \
92 $(dir $(call gb_InstallModuleTarget_get_target,$(1))).dir
93
94 diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
95 index 506e7b3..35ea142 100644
96 --- a/solenv/gbuild/InstallScript.mk
97 +++ b/solenv/gbuild/InstallScript.mk
98 @@ -32,6 +32,10 @@ gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET)
99
100 gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
101
102 +define gb_InstallScriptTarget__get_files
103 +$(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
104 +endef
105 +
106 # Pass first arg if make is running in silent mode, second arg otherwise
107 define gb_InstallScriptTarget__if_silent
108 $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
109 @@ -42,11 +46,11 @@ $(call gb_Output_announce,$(2),$(true),INS,4)
110 $(call gb_Helper_abbreviate_dirs,\
111 RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
112 $(call gb_InstallScriptTarget__make_arglist,\
113 - $(notdir $(foreach module,$(SCP_MODULE_DIRS),$(wildcard $(module)/*$(SCP_SUFFIX))))) \
114 + $(call gb_InstallScriptTarget__get_files,$(SCP_MODULES))) \
115 ) && \
116 $(gb_InstallScriptTarget_COMMAND) \
117 $(call gb_InstallScriptTarget__if_silent,-q) \
118 - -i $(call gb_InstallScriptTarget__make_arglist,$(SCP_MODULE_DIRS) $(OUTDIR)/par) \
119 + -i $(OUTDIR)/par/osl \
120 -o $(1) \
121 @@$${RESPONSEFILE} && \
122 rm -f $${RESPONSEFILE} \
123 @@ -70,15 +74,14 @@ $(call gb_InstallScriptTarget_get_clean_target,%) :
124 # gb_InstallScriptTarget_InstallScriptTarget(<target>)
125 define gb_InstallScriptTarget_InstallScriptTarget
126 $(call gb_InstallScriptTarget_get_target,$(1)) :| $(dir $(call gb_InstallScriptTarget_get_target,$(1))).dir
127 -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS :=
128 -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_SUFFIX := $(suffix $(call gb_ScpTarget_get_target,%))
129 +$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES :=
130
131 endef
132
133 define gb_InstallScriptTarget_use_module
134 -$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(2))
135 -$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(2))
136 -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS += $(call gb_InstallModuleTarget_get_workdir,$(2))
137 +$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
138 +$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
139 +$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES += $(2)
140
141 endef
142
143 diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
144 index ffd60b4..5a86504 100644
145 --- a/solenv/gbuild/TargetLocations.mk
146 +++ b/solenv/gbuild/TargetLocations.mk
147 @@ -94,10 +94,12 @@ gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
148 gb_ExternalLib_get_workdir = $(WORKDIR)/ExternalLib/$(1)
149 gb_ExternalLib_get_builddir = $(WORKDIR)/ExternalLib/$(1)/build
150 gb_ExternalLib_get_target = $(WORKDIR)/ExternalLib/$(1).done
151 +gb_InstallModule_get_filelist = $(call gb_InstallModuleTarget_get_filelist,$(1))
152 gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done
153 gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external
154 -gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).done
155 -gb_InstallModuleTarget_get_workdir = $(WORKDIR)/InstallModuleTarget/$(1)
156 +gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
157 +gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
158 +gb_InstallModuleTarget_get_workdir = $(patsubst %/,%,$(dir $(call gb_ScpTarget_get_target,%)))
159 gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
160 gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
161 gb_Jar_get_classsetname = Jar/$(1)
162 --
163 1.7.10.2

  ViewVC Help
Powered by ViewVC 1.1.20