diff options
author | Kai Kang <kai.kang@windriver.com> | 2013-06-19 07:49:42 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-09 10:53:55 +0100 |
commit | 3851ae052469cbec287616a30ee3dfddcff68dce (patch) | |
tree | d96d0951ef3eefc4839190cbd3ff01313a1fedaa /meta/recipes-devtools | |
parent | 88c4df03a7578b18644a78e3b8dc233174c3134b (diff) | |
download | poky-3851ae052469cbec287616a30ee3dfddcff68dce.tar.gz |
python-pygtk: fix parallel compile issue
defs.c dependes on gdk-types.defs and gtk-types.defs. When parallel
compile, it may fails with:
"IOError: [Errno 2] No such file or directory: 'gtk-types.defs'"
Add them to dependences of defs.c to fix this issue.
(From OE-Core master rev: edf278eec71552bcd3ac661dce8e8b7489463f6a)
(From OE-Core rev: a0a2a012e843ccaa95b23c53c4b96ac46d36d719)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-pygtk_2.24.0.bb | 3 |
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch b/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch new file mode 100644 index 0000000000..3ed954eee5 --- /dev/null +++ b/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From dc024e9079bbffbb44436ba3e70a758ebad5520f Mon Sep 17 00:00:00 2001 | ||
2 | From: "Song.Li" <Song.Li@windriver.com> | ||
3 | Date: Sat, 5 Jan 2013 14:55:59 +0800 | ||
4 | Subject: [PATCH] update dependences of defs.c in Makefile.am | ||
5 | |||
6 | In gtk/Makefile.am, defs.c should dependes on gdk-types.defs and | ||
7 | gtk-types.defs, otherwise it fails occasionally when parallel compile. | ||
8 | The error message: | ||
9 | "IOError: [Errno 2] No such file or directory: 'gtk-types.defs'" | ||
10 | |||
11 | Add them to dependences of defs.c to fix this issue. | ||
12 | |||
13 | Upstream-Status: Submitted | ||
14 | https://bugzilla.gnome.org/show_bug.cgi?id=702706 | ||
15 | |||
16 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | |||
19 | --- | ||
20 | gtk/Makefile.am | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am | ||
24 | index 7bb5d0c..91826cb 100644 | ||
25 | --- a/gtk/Makefile.am | ||
26 | +++ b/gtk/Makefile.am | ||
27 | @@ -289,7 +289,7 @@ if HAVE_GIO_TYPES_DEFS | ||
28 | extra_codegen_args += --register $(PYGOBJECT_DEFSDIR)/gio-types.defs | ||
29 | endif | ||
30 | |||
31 | -.defs.c: | ||
32 | +.defs.c: gdk-types.defs gtk-types.defs | ||
33 | ($(PYTHON) $(CODEGENDIR)/codegen.py \ | ||
34 | $(PYGTK_CODEGEN_DEFINES) \ | ||
35 | -I $(srcdir) \ | ||
36 | -- | ||
37 | 1.7.9.5 | ||
38 | |||
diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb index 0342f826c5..475ea17300 100644 --- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb +++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb | |||
@@ -15,7 +15,8 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar | |||
15 | file://fix-gtkunixprint.patch \ | 15 | file://fix-gtkunixprint.patch \ |
16 | file://prevent_to_get_display_during_import.patch \ | 16 | file://prevent_to_get_display_during_import.patch \ |
17 | file://nodocs.patch \ | 17 | file://nodocs.patch \ |
18 | file://acinclude.m4" | 18 | file://acinclude.m4 \ |
19 | file://update-dependences-of-defs.c.patch" | ||
19 | 20 | ||
20 | SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49" | 21 | SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49" |
21 | SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912" | 22 | SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912" |