diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2012-11-19 18:11:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-24 15:12:36 +0000 |
commit | e63596e7b0b643053aa2f81704308ecea314f42a (patch) | |
tree | f90af01d09383d678d9bc1117aaa2d722a0cd8a8 /meta/recipes-devtools | |
parent | 6f605dee611ccbee1c6d57097fbd406cf30b4315 (diff) | |
download | poky-e63596e7b0b643053aa2f81704308ecea314f42a.tar.gz |
python-pygtk: add gtk-types.defs into gdk.c dependence
gdk.c depends on gtk-types.defs but
gdk/Makefile.am miss this. This will cause
build error sometimes when built
with multi-jobbing, so add gtk-types.defs into
gdk.c dependence.
[YOCTO #3460]
(From OE-Core rev: 0e97ef30c3819e22f43d88e817e8a8b39ca30e5d)
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@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/add-gtk-types.defs-into-gdk.c-dependence.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-pygtk_2.24.0.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch b/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch new file mode 100644 index 0000000000..df0f9cd6c0 --- /dev/null +++ b/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | add gtk-types.defs into gdk.c dependence | ||
4 | |||
5 | gdk.c depends on gtk-types.defs but | ||
6 | gdk/Makefile.am miss this. This will cause | ||
7 | build error sometimes when built | ||
8 | with multi-jobbing, so add gtk-types.defs into | ||
9 | gdk.c dependence. | ||
10 | |||
11 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
13 | --- | ||
14 | gtk/Makefile.am | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
16 | |||
17 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am | ||
18 | index 7bb5d0c..4a88351 100644 | ||
19 | --- a/gtk/Makefile.am | ||
20 | +++ b/gtk/Makefile.am | ||
21 | @@ -214,7 +214,7 @@ gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile | ||
22 | gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile | ||
23 | $(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS) | ||
24 | |||
25 | -gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES) | ||
26 | +gdk.c: gdk-types.defs gtk-types.defs gdk.defs $(GDK_OVERRIDES) | ||
27 | gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES) | ||
28 | _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) | ||
29 | _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk | ||
30 | -- | ||
31 | 1.7.4 | ||
32 | |||
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 4747d98ca3..624d924f36 100644 --- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb +++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | |||
11 | PR = "r1" | 11 | PR = "r1" |
12 | 12 | ||
13 | SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \ | 13 | SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \ |
14 | file://add-gtk-types.defs-into-gdk.c-dependence.patch \ | ||
14 | file://fix-gtkunixprint.patch \ | 15 | file://fix-gtkunixprint.patch \ |
15 | file://prevent_to_get_display_during_import.patch \ | 16 | file://prevent_to_get_display_during_import.patch \ |
16 | file://nodocs.patch \ | 17 | file://nodocs.patch \ |