* [PATCH 0/3] Some fixes for packages under recipes-devtools
@ 2013-06-19 11:57 Kai Kang
2013-06-19 11:57 ` [PATCH 1/3] openjade-native: fix build failure Kai Kang
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Kai Kang @ 2013-06-19 11:57 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 1dd643b142c69ac9035e29bff11d02201638dc65:
licences: Add SGI license (2013-06-17 16:45:37 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/devtools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/devtools
Kai Kang (3):
openjade-native: fix build failure
python-pygobject: disable parallel install
python-pygtk: fix parallel compile issue
.../openjade/openjade-1.3.2/fix-regex.patch | 32 +++++++++++++++++
.../openjade/openjade-native_1.3.2.bb | 3 +-
.../python/python-pygobject_2.27.91.bb | 2 +
.../update-dependences-of-defs.c.patch | 36 ++++++++++++++++++++
.../recipes-devtools/python/python-pygtk_2.24.0.bb | 3 +-
5 files changed, 74 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
create mode 100644 meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
--
1.7.5.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] openjade-native: fix build failure
2013-06-19 11:57 [PATCH 0/3] Some fixes for packages under recipes-devtools Kai Kang
@ 2013-06-19 11:57 ` Kai Kang
2013-06-19 11:57 ` [PATCH 2/3] python-pygobject: disable parallel install Kai Kang
2013-06-19 11:57 ` [PATCH 3/3] python-pygtk: fix parallel compile issue Kai Kang
2 siblings, 0 replies; 9+ messages in thread
From: Kai Kang @ 2013-06-19 11:57 UTC (permalink / raw)
To: openembedded-core
Fix openjade-native build failure when build directory name contains the
characters ".a".
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../openjade/openjade-1.3.2/fix-regex.patch | 32 ++++++++++++++++++++
.../openjade/openjade-native_1.3.2.bb | 3 +-
2 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
new file mode 100644
index 0000000..6b40afd
--- /dev/null
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
@@ -0,0 +1,32 @@
+From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001
+From: benvm <benvm@yow-gmoffatt-lx2.wrs.com>
+Date: Wed, 9 Jan 2013 12:14:06 -0500
+Subject: [PATCH] Fix Makefile regular expression
+
+This patch modifies a regular expression within a Makefile to stop builds
+from failing in the case where the path contains the characters ".a".
+
+Upstream-Status: Submitted
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ Makefile.prog.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.prog.in b/Makefile.prog.in
+index 76310c9..44c3534 100644
+--- a/Makefile.prog.in
++++ b/Makefile.prog.in
+@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
+
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++ echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt
+
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+
+--
+1.7.0.4
+
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 266210d..8af0b52 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -16,7 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
file://makefile.patch \
file://msggen.pl.patch \
file://reautoconf.patch \
- file://user-declared-default-constructor.patch"
+ file://user-declared-default-constructor.patch \
+ file://fix-regex.patch"
SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] python-pygobject: disable parallel install
2013-06-19 11:57 [PATCH 0/3] Some fixes for packages under recipes-devtools Kai Kang
2013-06-19 11:57 ` [PATCH 1/3] openjade-native: fix build failure Kai Kang
@ 2013-06-19 11:57 ` Kai Kang
2013-06-19 12:08 ` Burton, Ross
2013-06-19 11:57 ` [PATCH 3/3] python-pygtk: fix parallel compile issue Kai Kang
2 siblings, 1 reply; 9+ messages in thread
From: Kai Kang @ 2013-06-19 11:57 UTC (permalink / raw)
To: openembedded-core
The installation of __glib.so is invoked by install-data-am target
which are generated by automake. installing libpyglib-2.0-python is
invoked by install-exec-am.
"make install" will firstly install libpyglib-2.0-python, then install
__glib.so, the sequence should not be broken, since _glib.so has
dependence on libpyglib-2.0-python. But when enable parallel install,
the sequence maybe break then installation fails with:
"/usr/bin/ld: cannot find -lpyglib-2.0-python"
Disable parallel install to fix this issue.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../python/python-pygobject_2.27.91.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index 3dc2d99..b991093 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -20,6 +20,8 @@ S = "${WORKDIR}/pygobject-${PV}"
FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
EXTRA_OECONF += "--disable-introspection"
+sRALLEL_MAKEINST = ""
+
inherit autotools distutils-base pkgconfig
# necessary to let the call for python-config succeed
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] python-pygobject: disable parallel install
2013-06-19 11:57 ` [PATCH 2/3] python-pygobject: disable parallel install Kai Kang
@ 2013-06-19 12:08 ` Burton, Ross
2013-06-20 1:36 ` Kang Kai
0 siblings, 1 reply; 9+ messages in thread
From: Burton, Ross @ 2013-06-19 12:08 UTC (permalink / raw)
To: Kai Kang; +Cc: openembedded-core
On 19 June 2013 12:57, Kai Kang <kai.kang@windriver.com> wrote:
> +sRALLEL_MAKEINST = ""
Typo :)
Ross
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] python-pygobject: disable parallel install
2013-06-19 12:08 ` Burton, Ross
@ 2013-06-20 1:36 ` Kang Kai
0 siblings, 0 replies; 9+ messages in thread
From: Kang Kai @ 2013-06-20 1:36 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
On 2013年06月19日 20:08, Burton, Ross wrote:
> On 19 June 2013 12:57, Kai Kang <kai.kang@windriver.com> wrote:
>> +sRALLEL_MAKEINST = ""
> Typo :)
>
> Ross
>
Sorry, will fix :)
--
Regards,
Neil | Kai Kang
[-- Attachment #2: Type: text/html, Size: 871 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] python-pygtk: fix parallel compile issue
2013-06-19 11:57 [PATCH 0/3] Some fixes for packages under recipes-devtools Kai Kang
2013-06-19 11:57 ` [PATCH 1/3] openjade-native: fix build failure Kai Kang
2013-06-19 11:57 ` [PATCH 2/3] python-pygobject: disable parallel install Kai Kang
@ 2013-06-19 11:57 ` Kai Kang
2013-06-19 12:09 ` Burton, Ross
2 siblings, 1 reply; 9+ messages in thread
From: Kai Kang @ 2013-06-19 11:57 UTC (permalink / raw)
To: openembedded-core
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
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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 0/3] V2: Some fixes for packages under recipes-devtools
@ 2013-06-20 3:29 Kai Kang
2013-06-20 3:29 ` [PATCH 3/3] python-pygtk: fix parallel compile issue Kai Kang
0 siblings, 1 reply; 9+ messages in thread
From: Kai Kang @ 2013-06-20 3:29 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
V2:
* fix typo
* update upstream-status of python-pygtk/update-dependences-of-defs.c.patch
The following changes since commit e04e6dab0afa8f72bf001b0cc106cd13b7694a91:
bdwgc-native: Add missing pkgconfig DEPENDS (2013-06-19 18:03:35 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/devtools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/devtools
Kai Kang (3):
openjade-native: fix build failure
python-pygobject: disable parallel install
python-pygtk: fix parallel compile issue
.../openjade/openjade-1.3.2/fix-regex.patch | 32 ++++++++++++++++
.../openjade/openjade-native_1.3.2.bb | 3 +-
.../python/python-pygobject_2.27.91.bb | 2 +
.../update-dependences-of-defs.c.patch | 38 ++++++++++++++++++++
.../recipes-devtools/python/python-pygtk_2.24.0.bb | 3 +-
5 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
create mode 100644 meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
--
1.7.5.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] python-pygtk: fix parallel compile issue
2013-06-20 3:29 [PATCH 0/3] V2: Some fixes for packages under recipes-devtools Kai Kang
@ 2013-06-20 3:29 ` Kai Kang
0 siblings, 0 replies; 9+ messages in thread
From: Kai Kang @ 2013-06-20 3:29 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
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 | 38 ++++++++++++++++++++
.../recipes-devtools/python/python-pygtk_2.24.0.bb | 3 +-
2 files changed, 40 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.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..3ed954e
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
@@ -0,0 +1,38 @@
+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 should dependes on gdk-types.defs and
+gtk-types.defs, otherwise it fails occasionally when parallel compile.
+The error message:
+"IOError: [Errno 2] No such file or directory: 'gtk-types.defs'"
+
+Add them to dependences of defs.c to fix this issue.
+
+Upstream-Status: Submitted
+https://bugzilla.gnome.org/show_bug.cgi?id=702706
+
+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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-06-20 3:30 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-19 11:57 [PATCH 0/3] Some fixes for packages under recipes-devtools Kai Kang
2013-06-19 11:57 ` [PATCH 1/3] openjade-native: fix build failure Kai Kang
2013-06-19 11:57 ` [PATCH 2/3] python-pygobject: disable parallel install Kai Kang
2013-06-19 12:08 ` Burton, Ross
2013-06-20 1:36 ` Kang Kai
2013-06-19 11:57 ` [PATCH 3/3] python-pygtk: fix parallel compile issue Kai Kang
2013-06-19 12:09 ` Burton, Ross
2013-06-20 1:37 ` Kang Kai
-- strict thread matches above, loose matches on Subject: below --
2013-06-20 3:29 [PATCH 0/3] V2: Some fixes for packages under recipes-devtools Kai Kang
2013-06-20 3:29 ` [PATCH 3/3] python-pygtk: fix parallel compile issue Kai Kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.