diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch | 36 | ||||
-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 @@ | |||
1 | From 687e5a6598f89b97c89afb94d6ac3ec024dc08e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Song.Li" <Song.Li@windriver.com> | ||
3 | Date: Thu, 26 Jul 2012 14:19:46 +0800 | ||
4 | Subject: [PATCH] guile:meta/Makefile change install-data-hook to install-exec-hook | ||
5 | |||
6 | In guile meta/Makefile, what install-data-hook do | ||
7 | must be run after install-binSCRIPTS.so it's a exec hook, not a data hook. | ||
8 | If keep these exec-hook in data-hook,when we run make with multi-jobbing , | ||
9 | install-data-hook and install-binSCRIPTS will be separately | ||
10 | processed in different thread, no any dependence. | ||
11 | that will cause error sometimes. | ||
12 | |||
13 | [YOCTO #2796] | ||
14 | |||
15 | Upstream-Status:Submitted | ||
16 | Upstream Bugid :12015 email:12015@debbugs.gnu.org | ||
17 | guile bug maillist: bug-guile@gnu.org | ||
18 | |||
19 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
20 | --- | ||
21 | meta/Makefile.am | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/meta/Makefile.am b/meta/Makefile.am | ||
25 | index 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" | |||
13 | LICENSE = "GPLv3" | 13 | LICENSE = "GPLv3" |
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
15 | 15 | ||
16 | SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \ | 16 | SRC_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 | ||
28 | SRC_URI[md5sum] = "3438cd4415c0c43ca93a20e845eba7e2" | 27 | SRC_URI[md5sum] = "30ff9e94663a2e2098b52f8ce9d050b9" |
29 | SRC_URI[sha256sum] = "3ece055145a5020dd36b84f5fbccd4b3846a671960dd5ee55931555f03200950" | 28 | SRC_URI[sha256sum] = "6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338" |
30 | 29 | ||
31 | PR = "r2" | 30 | PR = "r0" |
32 | 31 | ||
33 | inherit autotools gettext | 32 | inherit autotools gettext |
34 | BBCLASSEXTEND = "native" | 33 | BBCLASSEXTEND = "native" |