summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch39
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.5.bb3
2 files changed, 41 insertions, 1 deletions
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 0000000000..9445fca640
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
@@ -0,0 +1,39 @@
1From 687e5a6598f89b97c89afb94d6ac3ec024dc08e2 Mon Sep 17 00:00:00 2001
2From: "Song.Li" <Song.Li@windriver.com>
3Date: Thu, 26 Jul 2012 14:19:46 +0800
4Subject: [PATCH] guile:meta/Makefile change install-data-hook to install-exec-hook
5
6In guile meta/Makefile, what install-data-hook do
7must be run after install-binSCRIPTS.so it's a exec hook, not a data hook.
8If keep these exec-hook in data-hook,when we run make with multi-jobbing ,
9install-data-hook and install-binSCRIPTS will be separately
10processed in different thread, no any dependence.
11that will cause error sometimes.
12
13[YOCTO #2796]
14
15Upstream Status:Submitted
16Upstream Bugid :12015 email:12015@debbugs.gnu.org
17guile bug maillist: bug-guile@gnu.org
18
19Signed-off-by: Song.Li <Song.Li@windriver.com>
20---
21 meta/Makefile.am | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/meta/Makefile.am b/meta/Makefile.am
25index f26fc44..e603e5c 100644
26--- a/meta/Makefile.am
27+++ b/meta/Makefile.am
28@@ -27,7 +27,7 @@ EXTRA_DIST= \
29 guild.in guile-config.in
30
31 # What we now call `guild' used to be known as `guile-tools'.
32-install-data-hook:
33+install-exec-hook:
34 cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \
35 $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT)
36
37--
381.7.9.5
39
diff --git a/meta/recipes-devtools/guile/guile_2.0.5.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
index 0e21d5e81c..8fae7125f4 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 \
22 file://guile_2.0.5_fix_cross_compilation.patch \ 22 file://guile_2.0.5_fix_cross_compilation.patch \
23 file://remove-gets.patch \ 23 file://remove-gets.patch \
24 file://arm_endianness.patch \ 24 file://arm_endianness.patch \
25 file://change-install-data-hook-to-install-exec-hook-in-gui.patch \
25 " 26 "
26 27
27# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 28# 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 \
30SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b" 31SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
31SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956" 32SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
32 33
33PR = "r4" 34PR = "r5"
34 35
35inherit autotools gettext 36inherit autotools gettext
36BBCLASSEXTEND = "native" 37BBCLASSEXTEND = "native"