Patchwork [V2] guile:meta/Makefile change install-data-hook to install-exec-hook

login
register
mail settings
Submitter Song.Li@windriver.com
Date July 28, 2012, 9:31 a.m.
Message ID <1343467905-10228-1-git-send-email-Song.Li@windriver.com>
Download mbox | patch
Permalink /patch/33239/
State Accepted
Commit 018d5b87bdf00e85fe34e6276bd99e118843d704
Headers show

Comments

Song.Li@windriver.com - July 28, 2012, 9:31 a.m.
From: "Song.Li" <Song.Li@windriver.com>

In guile meta/Makefile, what install-data-hook do
must be run after install-binSCRIPTS.so it's a exec hook, not a data hook.
If keep these exec-hook in data-hook,when we run make with multi-jobbing ,
install-data-hook and install-binSCRIPTS will be separately
processed in different thread, no any dependence.
that will cause error sometimes.

[YOCTO #2796]

Signed-off-by: Song.Li <Song.Li@windriver.com>
---
 ...all-data-hook-to-install-exec-hook-in-gui.patch |   39 ++++++++++++++++++++
 meta/recipes-devtools/guile/guile_2.0.5.bb         |    3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
Richard Purdie - July 29, 2012, 9:19 a.m.
On Sat, 2012-07-28 at 17:31 +0800, Song.Li@windriver.com wrote:
> From: "Song.Li" <Song.Li@windriver.com>
> 
> In guile meta/Makefile, what install-data-hook do
> must be run after install-binSCRIPTS.so it's a exec hook, not a data hook.
> If keep these exec-hook in data-hook,when we run make with multi-jobbing ,
> install-data-hook and install-binSCRIPTS will be separately
> processed in different thread, no any dependence.
> that will cause error sometimes.
> 
> [YOCTO #2796]
> 
> Signed-off-by: Song.Li <Song.Li@windriver.com>
> ---
>  ...all-data-hook-to-install-exec-hook-in-gui.patch |   39 ++++++++++++++++++++
>  meta/recipes-devtools/guile/guile_2.0.5.bb         |    3 +-
>  2 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
new file mode 100644
index 0000000..9445fca
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
@@ -0,0 +1,39 @@ 
+From 687e5a6598f89b97c89afb94d6ac3ec024dc08e2 Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Thu, 26 Jul 2012 14:19:46 +0800
+Subject: [PATCH] guile:meta/Makefile change install-data-hook to install-exec-hook
+
+In guile meta/Makefile, what install-data-hook do
+must be run after install-binSCRIPTS.so it's a exec hook, not a data hook.
+If keep these exec-hook in data-hook,when we run make with multi-jobbing ,
+install-data-hook and install-binSCRIPTS will be separately
+processed in different thread, no any dependence.
+that will cause error sometimes.
+
+[YOCTO #2796]
+
+Upstream Status:Submitted
+Upstream Bugid :12015 email:12015@debbugs.gnu.org
+guile bug maillist: bug-guile@gnu.org
+
+Signed-off-by: Song.Li <Song.Li@windriver.com>
+---
+ meta/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meta/Makefile.am b/meta/Makefile.am
+index f26fc44..e603e5c 100644
+--- a/meta/Makefile.am
++++ b/meta/Makefile.am
+@@ -27,7 +27,7 @@ EXTRA_DIST= \
+   guild.in guile-config.in
+ 
+ # What we now call `guild' used to be known as `guile-tools'.
+-install-data-hook:
++install-exec-hook:
+ 	cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \
+ 	$(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT)
+ 
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/guile/guile_2.0.5.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
index 0e21d5e..8fae712 100644
--- a/meta/recipes-devtools/guile/guile_2.0.5.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.5.bb
@@ -22,6 +22,7 @@  SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
            file://guile_2.0.5_fix_cross_compilation.patch \
            file://remove-gets.patch \
            file://arm_endianness.patch \
+           file://change-install-data-hook-to-install-exec-hook-in-gui.patch \
            "
 
 #           file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
@@ -30,7 +31,7 @@  SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
 SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
 SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools gettext
 BBCLASSEXTEND = "native"