evolution-data-server: delete unused patch parallelmake.patch

(From OE-Core rev: 557d81e4c323fb0f919b5ea466555b13d95b7584) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Martin Jansa <martin.jansa@gmail.com> 2012-05-07 22:06:01 +0200
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2012-05-08 14:49:15 +0100
commit: fb129e046717c68047cc3867e6e199231f55fa72 (patch)
tree: a8412f71461f8ba7f268f189bb3dfc42c813e96e /meta/recipes-sato
parent: cf4f26078a95eb9ab57ab72e49c540768c376f05 (diff)
download: poky-fb129e046717c68047cc3867e6e199231f55fa72.tar.gz
1 files changed, 0 insertions, 203 deletions
diff --git a/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch b/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch
deleted file mode 100644
index ee004a9539..0000000000
--- a/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Update git.mk to the version from Pango which has parallel make fixes.
-http://git.gnome.org/browse/pango/log/git.mk
-commit 6118d5891fee776a087855c335a73c79fdaf036c
-RP 16/3/10
-Upstream-Status: Pending
-Index: git/git.mk
-===================================================================
--- git.orig/git.mk     2010-02-05 14:57:15.000000000 +0000
-+++ git/git.mk  2010-03-16 11:30:23.000000000 +0000
-@@ -82,97 +82,106 @@
- ### .gitignore generation
- 
- $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-       @echo Generating $@; \
-       GTKDOCGITIGNOREFILES=; \
-       test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
-       GTKDOCGITIGNOREFILES=" \
-               $(DOC_MODULE)-decl-list.txt \
-               $(DOC_MODULE)-decl.txt \
-               tmpl/$(DOC_MODULE)-unused.sgml \
-               tmpl/*.bak \
-               xml html \
-               "; \
-       GNOMEDOCUTILSGITIGNOREFILES=; \
-       test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
-       GNOMEDOCUTILSGITIGNOREFILES=" \
-               $(_DOC_C_DOCS) \
-               $(_DOC_LC_DOCS) \
-               $(_DOC_OMF_ALL) \
-               $(_DOC_DSK_ALL) \
-               $(_DOC_HTML_ALL) \
-               $(_DOC_POFILES) \
-               */.xml2po.mo \
-               */*.omf.out \
-               "; \
-       INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
-       INTLTOOLGITIGNOREFILES=" \
-               po/Makefile.in.in \
-               po/Makefile.in \
-               po/Makefile \
-               po/*.gmo \
-               po/*.mo \
-               po/POTFILES \
-               po/stamp-it \
-               po/.intltool-merge-cache \
-               intltool-extract.in \
-               intltool-merge.in \
-               intltool-update.in \
-               "; \
-       AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
-       AUTOCONFGITIGNOREFILES=" \
-               autom4te.cache \
-               configure \
-               config.h \
-               stamp-h1 \
-               libtool \
-               config.lt \
-               "; \
-       for x in \
-               .gitignore \
-               $$GTKDOCGITIGNOREFILES \
-               $$GNOMEDOCUTILSGITIGNOREFILES \
-               $$INTLTOOLGITIGNOREFILES \
-               $$AUTOCONFGITIGNOREFILES \
-               $(GITIGNOREFILES) \
-               $(CLEANFILES) \
-               $(PROGRAMS) \
-               $(EXTRA_PROGRAMS) \
-               $(LTLIBRARIES) \
-               so_locations \
-               .libs _libs \
-               $(MOSTLYCLEANFILES) \
-               "*.$(OBJEXT)" \
-               "*.lo" \
-               $(DISTCLEANFILES) \
-               $(am__CONFIG_DISTCLEAN_FILES) \
-               $(CONFIG_CLEAN_FILES) \
-               TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-               "*.tab.c" \
-               $(MAINTAINERCLEANFILES) \
-               $(BUILT_SOURCES) \
-               $(DEPDIR) \
-               Makefile \
-               Makefile.in \
-               "*.orig" \
-               "*.rej" \
-               "*.bak" \
-               "*~" \
-               ".*.sw[nop]" \
-       ; do echo /$$x; done | \
-+       $(AM_V_GEN) \
-+       { \
-+               if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-+                       for x in \
-+                               $(DOC_MODULE)-decl-list.txt \
-+                               $(DOC_MODULE)-decl.txt \
-+                               tmpl/$(DOC_MODULE)-unused.sgml \
-+                               "tmpl/*.bak" \
-+                               xml html \
-+                       ; do echo /$$x; done; \
-+               fi; \
-+               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-+                       for x in \
-+                               $(_DOC_C_DOCS) \
-+                               $(_DOC_LC_DOCS) \
-+                               $(_DOC_OMF_ALL) \
-+                               $(_DOC_DSK_ALL) \
-+                               $(_DOC_HTML_ALL) \
-+                               $(_DOC_POFILES) \
-+                               "*/.xml2po.mo" \
-+                               "*/*.omf.out" \
-+                       ; do echo /$$x; done; \
-+               fi; \
-+               if test -f $(srcdir)/po/Makefile.in.in; then \
-+                       for x in \
-+                               po/Makefile.in.in \
-+                               po/Makefile.in \
-+                               po/Makefile \
-+                               po/POTFILES \
-+                               po/stamp-it \
-+                               po/.intltool-merge-cache \
-+                               "po/*.gmo" \
-+                               "po/*.mo" \
-+                               po/$(GETTEXT_PACKAGE).pot \
-+                               intltool-extract.in \
-+                               intltool-merge.in \
-+                               intltool-update.in \
-+                       ; do echo /$$x; done; \
-+               fi; \
-+               if test -f $(srcdir)/configure; then \
-+                       for x in \
-+                               autom4te.cache \
-+                               configure \
-+                               config.h \
-+                               stamp-h1 \
-+                               libtool \
-+                               config.lt \
-+                       ; do echo /$$x; done; \
-+               fi; \
-+               for x in \
-+                       .gitignore \
-+                       $(GITIGNOREFILES) \
-+                       $(CLEANFILES) \
-+                       $(PROGRAMS) \
-+                       $(check_PROGRAMS) \
-+                       $(EXTRA_PROGRAMS) \
-+                       $(LTLIBRARIES) \
-+                       so_locations \
-+                       .libs _libs \
-+                       $(MOSTLYCLEANFILES) \
-+                       "*.$(OBJEXT)" \
-+                       "*.lo" \
-+                       $(DISTCLEANFILES) \
-+                       $(am__CONFIG_DISTCLEAN_FILES) \
-+                       $(CONFIG_CLEAN_FILES) \
-+                       TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-+                       "*.tab.c" \
-+                       $(MAINTAINERCLEANFILES) \
-+                       $(BUILT_SOURCES) \
-+                       $(DEPDIR) \
-+                       Makefile \
-+                       Makefile.in \
-+                       "*.orig" \
-+                       "*.rej" \
-+                       "*.bak" \
-+                       "*~" \
-+                       ".*.sw[nop]" \
-+               ; do echo /$$x; done; \
-+       } | \
-        sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-        sed 's@/[.]/@/@g' | \
-       LANG=C sort | uniq > $@.tmp && \
-+       LC_ALL=C sort | uniq > $@.tmp && \
-        mv $@.tmp $@;
- 
-all: $(srcdir)/.gitignore gitignore-recurse
-gitignore-recurse:
-+all: $(srcdir)/.gitignore gitignore-recurse-maybe
-+gitignore-recurse-maybe:
-        @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-               list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-                 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
-               done; \
-+               $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-        fi;
-+gitignore-recurse:
-+       @for subdir in $(DIST_SUBDIRS); do \
-+         case " $(SUBDIRS) " in \
-+           *" $$subdir "*) :;; \
-+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
-+         esac; \
-+       done
-+gitignore: $(srcdir)/.gitignore gitignore-recurse
-+
- maintainer-clean: gitignore-clean
- gitignore-clean:
-        -rm -f $(srcdir)/.gitignore
-.PHONY: gitignore-clean gitignore-recurse
- 
-+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
author	Martin Jansa <martin.jansa@gmail.com>	2012-05-07 22:06:01 +0200
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2012-05-08 14:49:15 +0100
commit	fb129e046717c68047cc3867e6e199231f55fa72 (patch)
tree	a8412f71461f8ba7f268f189bb3dfc42c813e96e /meta/recipes-sato
parent	cf4f26078a95eb9ab57ab72e49c540768c376f05 (diff)
download	poky-fb129e046717c68047cc3867e6e199231f55fa72.tar.gz

diff --git a/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch b/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch deleted file mode 100644 index ee004a9539..0000000000 --- a/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch +++ /dev/null
@@ -1,203 +0,0 @@
1	Update git.mk to the version from Pango which has parallel make fixes.
2	http://git.gnome.org/browse/pango/log/git.mk
3	commit 6118d5891fee776a087855c335a73c79fdaf036c
4
5	RP 16/3/10
6
7	Upstream-Status: Pending
8
9	Index: git/git.mk
10	===================================================================
11	--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
12	+++ git/git.mk 2010-03-16 11:30:23.000000000 +0000
13	@@ -82,97 +82,106 @@
14	### .gitignore generation
15
16	$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
17	- @echo Generating $@; \
18	- GTKDOCGITIGNOREFILES=; \
19	- test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x \|\| \
20	- GTKDOCGITIGNOREFILES=" \
21	- $(DOC_MODULE)-decl-list.txt \
22	- $(DOC_MODULE)-decl.txt \
23	- tmpl/$(DOC_MODULE)-unused.sgml \
24	- tmpl/*.bak \
25	- xml html \
26	- "; \
27	- GNOMEDOCUTILSGITIGNOREFILES=; \
28	- test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x \|\| \
29	- GNOMEDOCUTILSGITIGNOREFILES=" \
30	- $(_DOC_C_DOCS) \
31	- $(_DOC_LC_DOCS) \
32	- $(_DOC_OMF_ALL) \
33	- $(_DOC_DSK_ALL) \
34	- $(_DOC_HTML_ALL) \
35	- $(_DOC_POFILES) \
36	- */.xml2po.mo \
37	- /.omf.out \
38	- "; \
39	- INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
40	- INTLTOOLGITIGNOREFILES=" \
41	- po/Makefile.in.in \
42	- po/Makefile.in \
43	- po/Makefile \
44	- po/*.gmo \
45	- po/*.mo \
46	- po/POTFILES \
47	- po/stamp-it \
48	- po/.intltool-merge-cache \
49	- intltool-extract.in \
50	- intltool-merge.in \
51	- intltool-update.in \
52	- "; \
53	- AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
54	- AUTOCONFGITIGNOREFILES=" \
55	- autom4te.cache \
56	- configure \
57	- config.h \
58	- stamp-h1 \
59	- libtool \
60	- config.lt \
61	- "; \
62	- for x in \
63	- .gitignore \
64	- $$GTKDOCGITIGNOREFILES \
65	- $$GNOMEDOCUTILSGITIGNOREFILES \
66	- $$INTLTOOLGITIGNOREFILES \
67	- $$AUTOCONFGITIGNOREFILES \
68	- $(GITIGNOREFILES) \
69	- $(CLEANFILES) \
70	- $(PROGRAMS) \
71	- $(EXTRA_PROGRAMS) \
72	- $(LTLIBRARIES) \
73	- so_locations \
74	- .libs _libs \
75	- $(MOSTLYCLEANFILES) \
76	- "*.$(OBJEXT)" \
77	- "*.lo" \
78	- $(DISTCLEANFILES) \
79	- $(am__CONFIG_DISTCLEAN_FILES) \
80	- $(CONFIG_CLEAN_FILES) \
81	- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
82	- "*.tab.c" \
83	- $(MAINTAINERCLEANFILES) \
84	- $(BUILT_SOURCES) \
85	- $(DEPDIR) \
86	- Makefile \
87	- Makefile.in \
88	- "*.orig" \
89	- "*.rej" \
90	- "*.bak" \
91	- "*~" \
92	- ".*.sw[nop]" \
93	- ; do echo /$$x; done \| \
94	+ $(AM_V_GEN) \
95	+ { \
96	+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
97	+ for x in \
98	+ $(DOC_MODULE)-decl-list.txt \
99	+ $(DOC_MODULE)-decl.txt \
100	+ tmpl/$(DOC_MODULE)-unused.sgml \
101	+ "tmpl/*.bak" \
102	+ xml html \
103	+ ; do echo /$$x; done; \
104	+ fi; \
105	+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
106	+ for x in \
107	+ $(_DOC_C_DOCS) \
108	+ $(_DOC_LC_DOCS) \
109	+ $(_DOC_OMF_ALL) \
110	+ $(_DOC_DSK_ALL) \
111	+ $(_DOC_HTML_ALL) \
112	+ $(_DOC_POFILES) \
113	+ "*/.xml2po.mo" \
114	+ "/.omf.out" \
115	+ ; do echo /$$x; done; \
116	+ fi; \
117	+ if test -f $(srcdir)/po/Makefile.in.in; then \
118	+ for x in \
119	+ po/Makefile.in.in \
120	+ po/Makefile.in \
121	+ po/Makefile \
122	+ po/POTFILES \
123	+ po/stamp-it \
124	+ po/.intltool-merge-cache \
125	+ "po/*.gmo" \
126	+ "po/*.mo" \
127	+ po/$(GETTEXT_PACKAGE).pot \
128	+ intltool-extract.in \
129	+ intltool-merge.in \
130	+ intltool-update.in \
131	+ ; do echo /$$x; done; \
132	+ fi; \
133	+ if test -f $(srcdir)/configure; then \
134	+ for x in \
135	+ autom4te.cache \
136	+ configure \
137	+ config.h \
138	+ stamp-h1 \
139	+ libtool \
140	+ config.lt \
141	+ ; do echo /$$x; done; \
142	+ fi; \
143	+ for x in \
144	+ .gitignore \
145	+ $(GITIGNOREFILES) \
146	+ $(CLEANFILES) \
147	+ $(PROGRAMS) \
148	+ $(check_PROGRAMS) \
149	+ $(EXTRA_PROGRAMS) \
150	+ $(LTLIBRARIES) \
151	+ so_locations \
152	+ .libs _libs \
153	+ $(MOSTLYCLEANFILES) \
154	+ "*.$(OBJEXT)" \
155	+ "*.lo" \
156	+ $(DISTCLEANFILES) \
157	+ $(am__CONFIG_DISTCLEAN_FILES) \
158	+ $(CONFIG_CLEAN_FILES) \
159	+ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
160	+ "*.tab.c" \
161	+ $(MAINTAINERCLEANFILES) \
162	+ $(BUILT_SOURCES) \
163	+ $(DEPDIR) \
164	+ Makefile \
165	+ Makefile.in \
166	+ "*.orig" \
167	+ "*.rej" \
168	+ "*.bak" \
169	+ "*~" \
170	+ ".*.sw[nop]" \
171	+ ; do echo /$$x; done; \
172	+ } \| \
173	sed "s@^/`echo "$(srcdir)" \| sed 's/\(.\)/[\1]/g'`/@/@" \| \
174	sed 's@/[.]/@/@g' \| \
175	- LANG=C sort \| uniq > $@.tmp && \
176	+ LC_ALL=C sort \| uniq > $@.tmp && \
177	mv $@.tmp $@;
178
179	-all: $(srcdir)/.gitignore gitignore-recurse
180	-gitignore-recurse:
181	+all: $(srcdir)/.gitignore gitignore-recurse-maybe
182	+gitignore-recurse-maybe:
183	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
184	- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
185	- test "$$subdir" = . \|\| (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
186	- done; \
187	+ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
188	fi;
189	+gitignore-recurse:
190	+ @for subdir in $(DIST_SUBDIRS); do \
191	+ case " $(SUBDIRS) " in \
192	+ " $$subdir ") :;; \
193	+ *) test "$$subdir" = . \|\| (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse \|\| echo "Skipping $$subdir");; \
194	+ esac; \
195	+ done
196	+gitignore: $(srcdir)/.gitignore gitignore-recurse
197	+
198	maintainer-clean: gitignore-clean
199	gitignore-clean:
200	-rm -f $(srcdir)/.gitignore
201	-.PHONY: gitignore-clean gitignore-recurse
202
203	+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe