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:08 +0000 |
| commit | 0e97ef30c3819e22f43d88e817e8a8b39ca30e5d (patch) | |
| tree | d81f12ccc0dd64d93073720d92e90155cb08d22e | |
| parent | c675b53b9f3f3d858e2fa93170f731656d3fc3f6 (diff) | |
| download | openembedded-core-contrib-0e97ef30c3819e22f43d88e817e8a8b39ca30e5d.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]
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>
| -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 @@ +Upstream-Status: Submitted + +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. + +Signed-off-by: Song.Li <Song.Li@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + gtk/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 7bb5d0c..4a88351 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -214,7 +214,7 @@ gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile + gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile + $(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS) + +-gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES) ++gdk.c: gdk-types.defs gtk-types.defs gdk.defs $(GDK_OVERRIDES) + gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES) + _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) + _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk +-- +1.7.4 + 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" PR = "r1" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \ + file://add-gtk-types.defs-into-gdk.c-dependence.patch \ file://fix-gtkunixprint.patch \ file://prevent_to_get_display_during_import.patch \ file://nodocs.patch \ |