summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/guile
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2012-12-14 13:43:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:53 +0000
commit606561953a5fafa735ffe34311dc490f6ee9c554 (patch)
treeb19f965c8192d01b3794d3967130869167a9e5f9 /meta/recipes-devtools/guile
parent00dd34b92f58295979957a38e827eafb41df8372 (diff)
downloadpoky-606561953a5fafa735ffe34311dc490f6ee9c554.tar.gz
guile: update to upstream version 2.0.7
change-install-data-hook-to-install-exec-hook-in-gui.patch is now part of upstream. (From OE-Core rev: 3d03eb7430849d7bd709e70a300efeb4a88cdb20) Signed-off-by: Marko Lindqvist <cazfi74@gmail.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/guile')
-rw-r--r--meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch36
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.7.bb (renamed from meta/recipes-devtools/guile/guile_2.0.6.bb)9
2 files changed, 4 insertions, 41 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
deleted file mode 100644
index df61e5d104..0000000000
--- a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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 a05730d..bd20784 100644
26--- a/meta/Makefile.am
27+++ b/meta/Makefile.am
28@@ -28,7 +28,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 guild="`echo $(ECHO_N) guild \
35 | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
36 guile_tools="`echo $(ECHO_N) guile-tools \
diff --git a/meta/recipes-devtools/guile/guile_2.0.6.bb b/meta/recipes-devtools/guile/guile_2.0.7.bb
index 45603e6eda..7f3316a893 100644
--- a/meta/recipes-devtools/guile/guile_2.0.6.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.7.bb
@@ -13,22 +13,21 @@ SECTION = "devel"
13LICENSE = "GPLv3" 13LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 14LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
15 15
16SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \ 16SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \ 17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \
18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \ 18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \
19 file://opensuse/guile-64bit.patch \ 19 file://opensuse/guile-64bit.patch \
20 file://guile_2.0.6_fix_sed_error.patch \ 20 file://guile_2.0.6_fix_sed_error.patch \
21 file://arm_endianness.patch \ 21 file://arm_endianness.patch \
22 file://change-install-data-hook-to-install-exec-hook-in-gui.patch \
23 " 22 "
24 23
25# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 24# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
26# file://opensuse/guile-turn-off-gc-test.patch 25# file://opensuse/guile-turn-off-gc-test.patch
27 26
28SRC_URI[md5sum] = "3438cd4415c0c43ca93a20e845eba7e2" 27SRC_URI[md5sum] = "30ff9e94663a2e2098b52f8ce9d050b9"
29SRC_URI[sha256sum] = "3ece055145a5020dd36b84f5fbccd4b3846a671960dd5ee55931555f03200950" 28SRC_URI[sha256sum] = "6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338"
30 29
31PR = "r2" 30PR = "r0"
32 31
33inherit autotools gettext 32inherit autotools gettext
34BBCLASSEXTEND = "native" 33BBCLASSEXTEND = "native"