Patchwork [3/3] python-pygtk: fix parallel compile issue

login
register
mail settings
Submitter Kang Kai
Date June 19, 2013, 11:57 a.m.
Message ID <4eb86c7d04788a85aa2c8c2244b9c69514decd92.1371642926.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/51995/
State New
Headers show

Comments

Kang Kai - June 19, 2013, 11:57 a.m.
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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../update-dependences-of-defs.c.patch             |   36 ++++++++++++++++++++
 .../recipes-devtools/python/python-pygtk_2.24.0.bb |    3 +-
 2 files changed, 38 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
Ross Burton - June 19, 2013, 12:09 p.m.
On 19 June 2013 12:57, Kai Kang <kai.kang@windriver.com> wrote:
> +Upstream-Status: Pending

This is clearly an upstream bug, please submit the patch to bugzilla.gnome.org.

Ross
Kang Kai - June 20, 2013, 1:37 a.m.
On 2013?06?19? 20:09, Burton, Ross wrote:
> On 19 June 2013 12:57, Kai Kang <kai.kang@windriver.com> wrote:
>> +Upstream-Status: Pending
> This is clearly an upstream bug, please submit the patch to bugzilla.gnome.org.

OK, thanks.

>
> Ross
>
>

Patch

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 0000000..5875d0d
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
@@ -0,0 +1,36 @@ 
+From dc024e9079bbffbb44436ba3e70a758ebad5520f Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Sat, 5 Jan 2013 14:55:59 +0800
+Subject: [PATCH] update dependences of defs.c in Makefile.am
+
+In gtk/Makefile.am, defs.c dependes on
+gdk-types.defs and gtk-types.defs, so
+add them into dependences of defs.c.
+otherwise there will be build error
+sometimes when build with "make -j".
+
+Upstream-Status: Pending
+
+Signed-off-by: Song.Li <Song.Li@windriver.com>
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ gtk/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 7bb5d0c..91826cb 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -289,7 +289,7 @@ if HAVE_GIO_TYPES_DEFS
+ extra_codegen_args += --register $(PYGOBJECT_DEFSDIR)/gio-types.defs
+ endif
+ 
+-.defs.c: 
++.defs.c: gdk-types.defs gtk-types.defs
+ 	($(PYTHON) $(CODEGENDIR)/codegen.py \
+ 	   $(PYGTK_CODEGEN_DEFINES) \
+ 	    -I $(srcdir) \
+-- 
+1.7.9.5
+
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 0342f82..475ea17 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
            file://fix-gtkunixprint.patch \
            file://prevent_to_get_display_during_import.patch \
            file://nodocs.patch \
-           file://acinclude.m4"
+           file://acinclude.m4 \
+           file://update-dependences-of-defs.c.patch"
 
 SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49"
 SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912"