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